Adds mocha
Re-organize route helpers and tests