Clean up and test
Clean up and test