GCP-7873 and GCP-7875 junit tests