Fixed failing tests
Fixed the tests.