Cleand up some of the tests.