Further tweaking tests to make them pass even on laggy hardware.