test fixes
Merge pull request #1560 from marcel-blonk/PLFM-2987

test fixes