make test more reliable
Revert "make test more reliable"

This reverts commit ec0c1875c855927d22755ae173ed3f92b45f7ecf.
Merge remote-tracking branch 'upstream/develop' into PLFM-2882
make test more reliable
Merge pull request #1433 from marcel-blonk/PLFM-2882

Make test more reliable
PLFM-2903
Merge pull request #1434 from brucehoff/PLFM-2903

PLFM-2903