Adding mocha for later, but might prefer tape.
Minor changes to makomi-express