Changed to use Apache Commons CLI to do argument parsing
Fixed the tests related to this