Working Mocha tests fixes #20