Merge pull request #9 from ruzickap/feature/adding_tests

Adding tests + bugfix in Jinja template