Filling in tests for initial cli options
Handling more options in standalone executable
Changing option metavars to match the ENV defaults