Bug 956648 - Remove timeouts from tests