Changed handlebars helpers and added tests