Reviewed-by: dfuchs, mullan, rriggs, alanb
Removed timeout=5 from the tests so that default timeout is used Reviewed-by: cjplummer
Reviewed-by: darcy, ihse