Add mocha and should into mix