Fix fp tests + prevent waitFor killing runner
Merge pull request #227 from muffinresearch/fix-fp-test-and-waitfor

Fix fp tests + prevent waitFor killing runner