Added tests
Revert unwanted change
Added missing empty lines
Merge pull request #22 from norzechowicz/twig

Added tests