Prepared for new setter injection and improved unit test code coverage.