Mocha stuff, changed testing stuff