Remove unwanted tests and correct some others