Reviewed-by: dfuchs, jmanson
Fixed test case wrongly reporting timeout failures. Reviewed-by: dholmes, hb
Reviewed-by: darcy, ihse