Fixed unit tests broken as a result of PDI-9048