Mocha tests broken

Broke because of problem with #1259 merge