Saucelabs

Please merge my branch. It is not passing all tests just because the master is failing with the same troubles. Sauce Labs is working as expected.