More testing of generate_argument_parser, cleanup the file a bit