timing tweaks to make the tests more robust