slight cleanup/fix of Linux test timeout code