Remove two more tests