Fixed templates because they were switched
Added mocha test