Simplified test signatures
Simplified test signatures

I had done too much copying and pasting of test code: my data-driven
tests included parameters that were not needed by the tests.

This commit eliminates those unneeded paramaters.

mrwizard82d1/rick,mrwizard82d1/rick,mrwizard82d1/rick,mrwizard82d1/rick