GCP-5668, GCP-5671, Test classes warning cleanup