Update QueryRountrip integration test to use new factories

Change-Id: Icdd3d9e1c34b782489551d1f9f2ad33251693bfb