Clean up tests slightly