[#47984789] Make unit tests pass again (Jenkins)