Test coverage improvements.