Stronger test coverage