Clean up a few tests