Tidy argv test cases.
Refactor argv tests.
Assert on custom long options.
Remove debug statement.
Update example comments.