Adding good command line parsing, and passing a test