Merge "Fixed failing tests"