PDI-10869: fix tests.
Merge pull request #87 from rpbouman/master

PDI-10869: fix tests.