Fix Gitlab's test suites
**Problem** Our patches are breaking Gitlab's tests. **Task description** Update the tests to pass with the changes needed made by Heptapod.
issue