Fixes for UTs failure after codebase changes

2 jobs for !44 with improve-code-coverage in 45 minutes and 51 seconds (queued for 1 second)
latest merge request