Merge "Fixed the failed unit tests"