Clean up messy tests.