align this with changes to BulkReadWriteTest since City is independent now