fixes to TIMED_BLOCK errors in test