[PDI-6532] unit tests added