Summary: Arbitrary timeouts in the tests @run lines where too agressive for some configurations. The tests will now run with default timeout.
Reviewed-by: alanb, mchung