"Fixing test"
Merge branch 'refactoring' into development
Solving issue #2: templates calm & Elegant
Better tests