Eliminate testList and pass args directly to the testHook
Merge pull request #1982 from thomie/cleanup

Small cleanup