tested and fixed
smaller timeout
Merge pull request #1380 from john-hill/PLFM-2850

Plfm 2850