Updates to tests for fixed timedout return.