Removed the TemplateHandler Interface.
Did some refactoring. Added tests