Removed some excessive and pointless tests.