Some more cleanup for the tests