attempt to make these tests more resilient to timing issues