Added Handlebars binding, moved test classes