(#2500) - Remove shorter timeout and enable saucelabs
(#2497) - fix attachments in Chrome and IE