bugzid:5896 - Add template Tests
Merge pull request #24 from sailthru/bug-5896

bugzid:5896 - Add template tests