Major changes refactoring class names and tml templates for unit tests