(#1843) - Get tests passing on saucelabs