Cleans up tests, in preparation for 1.2 release testing. Only one testing mechanism exists now, and it is simpler.