For ENG-5962, fix test bugs in TestClientInterface