Remove more tests