GCP-8262, GCP-8154, JUnit cleanup