More unit tests for Template and Writer
Merge pull request #131 from ivanlanin/develop

More unit tests for Template and Writer