Cleanup some tests a little.