Increased unit test coverage