[fedocal] master: Fix unit-tests and coverage (e13c497)