more test fixes for ci

1 job for master in 21 minutes and 46 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed Test #8846
ci-test

00:21:46