Remove the tests that fail on bad parameter order.

Stress parameter order by reordering some of the test parameters.
Merge branch 'getopts' into merge