Cleanup some tests