Remove even more tests