Remove old test script, use FAKE instead

Also update help text for consistency with current behaviour
Merge pull request #843 from rneatherway/issues836+841

Remove old test script, use FAKE instead