New unit tests for Writer
Additional template test
Merge pull request #138 from ivanlanin/develop

Additional unit tests