Testing coverage improvements