tweaks for jacoco functional test coverage