Clean up and testing