Added mocha, before small refactor