Clean up tests #51