Fix unit test follow-ups from post-merge review#2239

berendt merged 10 commits into

mainosism/python-osism:mainfrom

fix/unit-test-followupsosism/python-osism:fix/unit-test-followupsCopy head branch name to clipboard