Clean up for a couple of tests