Remove mocha dependencies and more spec cleanup