Fix Sinon.JS conflicts