Fix command line options
Fix test for Ruby 2.0