unit-tests fix.