More refactoring of handlebars helpers
Each loops works again
Fix tests