Fix confusion on what the -o option does.

Also updates tests to work with the new options.

Fixes #338.