[fedocal] master: Fix unit-tests (f6f0c2b)