Clean up tests fixtures a bit