Add unit tests and refactor for testability#2

igorgatis wants to merge 2 commits intomainigorgatis/date-time-commit-release:mainfrom

feature/add-unit-testsigorgatis/date-time-commit-release:feature/add-unit-testsCopy head branch name to clipboard