ready
moved test to test folder
fix for test
Merge pull request #994 from john-hill/PLFM-2491

Plfm 2491