Fix for CFG unit-tests.