Merge "Add cleanup for endpoint tests"