Code coverage improvements, again