Remove unrelated pending tests

These don't belong in this branch.
Add another flag to the argument parser
Move flag related tests to describe block
Simplify method
Express test a bit differently
Add helpers for stubbing command line output
Move out option merging from parser

ArgumentParser should only handle parsing, not merging of options with
parsed arguments.

Tests were moved to cli_spec and rewritten somewhat.