refactoring + handlebar helper test