Added tests and used mustache instead of handlebars