fixing template around enable_group_conditionals
fixin up tests