Fix XML templates #289
Unit tests for XML templates
Merge pull request #291 from shermdog/289

Fix XML templates #289