(#2500) - Remove shorter timeout and enable saucelabs