Code coverage improvements.