Update unit test for GCP-5982