Ditched mustache-style and wrote more tests