Merge pull request #1333 from marcel-blonk/PLFM-2751

fixing tests