Fixed testing templates and grunt js tasks