make tests less senstive to timing issues