Clean up and testing.