Jenkins unit test fixes

I see that @HenningJ has Jenkins builds still enabled, so we'll see if the test triggered by this pull succeeds...

Fixes #1852 (hopefully)