Fixes to timeout test