Fix bulk unit test with race condition

[JoshMock]

A test skip was added in #2416. The test is flaky because of a race condition. This test is important, so it needs to be fixed rather than ignored indefinitely.