various cleanup

Joachim Wuttkerequested to merge
ex1 into main

in part driven by coverage test

Merge request reports