Fixed 7 or 9 tests