Integration test updates for CPP-164 (write batching)