Templates refactoring
Add unit tests to module
Templates refactoring