Force use of timeouts in ShellTest; Improve error reporting.