Flattener/mustache stuff
Started changing over test templates over to mustache