GCP-6082, GCP-6083, 6CP-6084, GCP-6085 stubs and junit tests