GCP-8262, JUnit cleanup