Disable tunnel-identifier for sauce labs, some little refactors