working #4 - code coverage improvements