Clean up and test