Remove a few unneccessary tests and correct useful ones.