Clean up tests a little