Remove tests that are invalid now...