improved templates to use grunt.template. added test