Fixed 4 unit test failures