-Broke out functionality to util classes that are injected through
constructors to enhance the testability of the code.
-Implemented tests.