Improved code coverage by refactoring and improving Unit Tests.