Continued to improve test coverage and spit out functionality into easier to test components.