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

ready