Clean up and test.
