Merge "Fixed failed unit tests"