Moving to mocha/sinon/chai