Switch back to saucelabs-custom due to issues with mocha reporting in saucelabs, and fix a test issue in firefox