code coverage improvements