* Fix coverage issue in CI * Adjust to latest findings Co-authored-by: Franck Nijhof <frenck@frenck.nl>