more race condition spec tweaks