PDI-10869: fix tests.
Merge pull request #86 from rpbouman/5.0

PDI-10869: fix tests.