PDI-10451: Fixed unit tests
Merge pull request #334 from mattyb149/PDI-10451

PDI-10451: Fixed unit tests