Fix eight failing tests; all template parsing tests now passing (#25).