Fixed 4 tests