added mustache templating . test cases updated