Code Coverage: User code coverage improvements