Updated remote query tests to take account for queries with uuids