bugfixes / test fixes (fixing ci)
Merge pull request #2723 from sebv/test-fixes

Bugfixes / test fixes (fixing ci)