Fixed 4 test failures