unit-tests: Adapted to coverity fixes