Revert all the things
Add mocha dependency