Fixed 2 tests