Remove tests not needed