eliminate more race conditions in tests