Cleanup and testing infrastructure