Add unit tests to support custom methods and twig extension
Merge branch 'bugfixes'
Remove empty lines
Merge branch 'unit_testing'
Merge from master