For ENG-6040, fix broken TestClientInterface.testGC