PDI-10451: Fixed unit tests