Adding mocha opts
More refactoring