Minor fixes from code review and make test more robust
Merge pull request #1575 from marcel-blonk/PLFM-3037

Minor fixes from code review and make test more robust