Adding Mocha and its friends