Cleanup and testing