Clean up tests a bit further