Cleaning up, renaming adding sanity
Adding Mustache, fixing test data