t 1.4.0 → 1.5.0

data/lib/t/printable.rb

@@ -1,7 +1,7 @@
 module T
   module Printable
     LIST_HEADINGS = ["ID", "Created at", "Screen name", "Slug", "Members", "Subscribers", "Mode", "Description"]
-    STATUS_HEADINGS = ["ID", "Posted at", "Screen name", "Text"]
+    TWEET_HEADINGS = ["ID", "Posted at", "Screen name", "Text"]
     USER_HEADINGS = ["ID", "Since", "Last tweeted at", "Tweets", "Favorites", "Listed", "Following", "Followers", "Screen name", "Name"]
     MONTH_IN_SECONDS = 2592000
 
@@ -13,7 +13,7 @@ module T
 
     def build_long_tweet(tweet)
       require 'htmlentities'
-      [tweet.id, ls_formatted_time(tweet), "@#{tweet.from_user}", HTMLEntities.new.decode(tweet.full_text).gsub(/\n+/, ' ')]
+      [tweet.id, ls_formatted_time(tweet), "@#{tweet.from_user}", decode_full_text(tweet, options['decode_urls']).gsub(/\n+/, ' ')]
     end
 
     def build_long_user(user)
@@ -46,7 +46,7 @@ module T
       require 'csv'
       require 'fastercsv' unless Array.new.respond_to?(:to_csv)
       require 'htmlentities'
-      say [tweet.id, csv_formatted_time(tweet), tweet.from_user, HTMLEntities.new.decode(tweet.full_text)].to_csv
+      say [tweet.id, csv_formatted_time(tweet), tweet.from_user, decode_full_text(tweet)].to_csv
     end
 
     def print_csv_user(user)
@@ -129,7 +129,7 @@ module T
       if options['csv']
         require 'csv'
         require 'fastercsv' unless Array.new.respond_to?(:to_csv)
-        say STATUS_HEADINGS.to_csv unless tweets.empty?
+        say TWEET_HEADINGS.to_csv unless tweets.empty?
         tweets.each do |tweet|
           print_csv_tweet(tweet)
         end
@@ -137,11 +137,11 @@ module T
         array = tweets.map do |tweet|
           build_long_tweet(tweet)
         end
-        format = options['format'] || STATUS_HEADINGS.size.times.map{"%s"}
-        print_table_with_headings(array, STATUS_HEADINGS, format)
+        format = options['format'] || TWEET_HEADINGS.size.times.map{"%s"}
+        print_table_with_headings(array, TWEET_HEADINGS, format)
       else
         tweets.each do |tweet|
-          print_message(tweet.user.screen_name, tweet.full_text)
+          print_message(tweet.user.screen_name, decode_urls(tweet.full_text, options['decode_urls'] ? tweet.urls : nil))
         end
       end
     end

data/lib/t/search.rb

@@ -18,6 +18,11 @@ module T
 
     check_unknown_options!
 
+    class_option "host", :aliases => "-H", :type => :string, :default => T::Requestable::DEFAULT_HOST, :desc => "Twitter API server"
+    class_option "no-color", :aliases => "-N", :type => :boolean, :desc => "Disable colorization in output"
+    class_option "no-ssl", :aliases => "-U", :type => :boolean, :default => false, :desc => "Disable SSL"
+    class_option "profile", :aliases => "-P", :type => :string, :default => File.join(File.expand_path("~"), T::RCFile::FILE_NAME), :desc => "Path to RC file", :banner => "FILE"
+
     def initialize(*)
       @rcfile = T::RCFile.instance
       super
@@ -26,10 +31,12 @@ module T
     desc "all QUERY", "Returns the #{DEFAULT_NUM_RESULTS} most recent Tweets that match the specified query."
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
+    method_option "decode_urls", :aliases => "-d", :type => :boolean, :default => false, :desc => "Decodes t.co URLs into their original form."
     method_option "number", :aliases => "-n", :type => :numeric, :default => DEFAULT_NUM_RESULTS
     def all(query)
-      rpp = options['number'] || DEFAULT_NUM_RESULTS
-      tweets = collect_with_rpp(rpp) do |opts|
+      count = options['number'] || DEFAULT_NUM_RESULTS
+      tweets = collect_with_count(count) do |opts|
+        opts[:include_entities] = 1 if options['decode_urls']
         client.search(query, opts).results
       end
       tweets.reverse! if options['reverse']
@@ -37,32 +44,34 @@ module T
       if options['csv']
         require 'csv'
         require 'fastercsv' unless Array.new.respond_to?(:to_csv)
-        say STATUS_HEADINGS.to_csv unless tweets.empty?
+        say TWEET_HEADINGS.to_csv unless tweets.empty?
         tweets.each do |tweet|
-          say [tweet.id, csv_formatted_time(tweet), tweet.from_user, HTMLEntities.new.decode(tweet.full_text)].to_csv
+          say [tweet.id, csv_formatted_time(tweet), tweet.from_user, decode_full_text(tweet)].to_csv
         end
       elsif options['long']
         array = tweets.map do |tweet|
-          [tweet.id, ls_formatted_time(tweet), "@#{tweet.from_user}", HTMLEntities.new.decode(tweet.full_text).gsub(/\n+/, ' ')]
+          [tweet.id, ls_formatted_time(tweet), "@#{tweet.from_user}", decode_full_text(tweet, options['decode_urls']).gsub(/\n+/, ' ')]
         end
-        format = options['format'] || STATUS_HEADINGS.size.times.map{"%s"}
-        print_table_with_headings(array, STATUS_HEADINGS, format)
+        format = options['format'] || TWEET_HEADINGS.size.times.map{"%s"}
+        print_table_with_headings(array, TWEET_HEADINGS, format)
       else
         say unless tweets.empty?
         tweets.each do |tweet|
-          print_message(tweet.from_user, tweet.full_text)
+          print_message(tweet.from_user, decode_full_text(tweet, options['decode_urls']))
         end
       end
     end
 
     desc "favorites [USER] QUERY", "Returns Tweets you've favorited that match the specified query."
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
-    method_option "id", :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify user via ID instead of screen name."
+    method_option "id", :aliases => "-i", :type => :boolean, :default => false, :desc => "Specify user via ID instead of screen name."
+    method_option "decode_urls", :aliases => "-d", :type => :boolean, :default => false, :desc => "Decodes t.co URLs into their original form."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
     def favorites(*args)
       opts = {:count => MAX_NUM_RESULTS}
       query = args.pop
       user = args.pop
+      opts[:include_entities] = 1 if options['decode_urls']
       if user
         require 't/core_ext/string'
         user = if options['id']
@@ -89,11 +98,13 @@ module T
 
     desc "list [USER/]LIST QUERY", "Returns Tweets on a list that match specified query."
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
-    method_option "id", :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify user via ID instead of screen name."
+    method_option "id", :aliases => "-i", :type => :boolean, :default => false, :desc => "Specify user via ID instead of screen name."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
+    method_option "decode_urls", :aliases => "-d", :type => :boolean, :default => false, :desc => "Decodes t.co URLs into their original form."
     def list(list, query)
       owner, list = extract_owner(list, options)
       opts = {:count => MAX_NUM_RESULTS}
+      opts[:include_entities] = 1 if options['decode_urls']
       tweets = collect_with_max_id do |max_id|
         opts[:max_id] = max_id unless max_id.nil?
         client.list_timeline(owner, list, opts)
@@ -107,8 +118,10 @@ module T
     desc "mentions QUERY", "Returns Tweets mentioning you that match the specified query."
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
+    method_option "decode_urls", :aliases => "-d", :type => :boolean, :default => false, :desc => "Decodes t.co URLs into their original form."
     def mentions(query)
       opts = {:count => MAX_NUM_RESULTS}
+      opts[:include_entities] = 1 if options['decode_urls']
       tweets = collect_with_max_id do |max_id|
         opts[:max_id] = max_id unless max_id.nil?
         client.mentions(opts)
@@ -122,12 +135,14 @@ module T
 
     desc "retweets [USER] QUERY", "Returns Tweets you've retweeted that match the specified query."
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
-    method_option "id", :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify user via ID instead of screen name."
+    method_option "id", :aliases => "-i", :type => :boolean, :default => false, :desc => "Specify user via ID instead of screen name."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
+    method_option "decode_urls", :aliases => "-d", :type => :boolean, :default => false, :desc => "Decodes t.co URLs into their original form."
     def retweets(*args)
       opts = {:count => MAX_NUM_RESULTS}
       query = args.pop
       user = args.pop
+      opts[:include_entities] = 1 if options['decode_urls']
       if user
         require 't/core_ext/string'
         user = if options['id']
@@ -154,12 +169,23 @@ module T
 
     desc "timeline [USER] QUERY", "Returns Tweets in your timeline that match the specified query."
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
-    method_option "id", :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify user via ID instead of screen name."
+    method_option "exclude", :aliases => "-e", :type => :string, :enum => %w(replies retweets), :desc => "Exclude certain types of Tweets from the results.", :banner => "TYPE"
+    method_option "id", :aliases => "-i", :type => :boolean, :default => false, :desc => "Specify user via ID instead of screen name."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
+    method_option "decode_urls", :aliases => "-d", :type => :boolean, :default => false, :desc => "Decodes t.co URLs into their original form."
     def timeline(*args)
       opts = {:count => MAX_NUM_RESULTS}
       query = args.pop
       user = args.pop
+      opts[:include_entities] = 1 if options['decode_urls']
+      exclude_opts = case options['exclude']
+      when 'replies'
+        {:exclude_replies => true}
+      when 'retweets'
+        {:include_rts => false}
+      else
+        {}
+      end
       if user
         require 't/core_ext/string'
         user = if options['id']
@@ -169,12 +195,12 @@ module T
         end
         tweets = collect_with_max_id do |max_id|
           opts[:max_id] = max_id unless max_id.nil?
-          client.user_timeline(user, opts)
+          client.user_timeline(user, opts.merge(exclude_opts))
         end
       else
         tweets = collect_with_max_id do |max_id|
           opts[:max_id] = max_id unless max_id.nil?
-          client.home_timeline(opts)
+          client.home_timeline(opts.merge(exclude_opts))
         end
       end
       tweets = tweets.select do |tweet|

data/lib/t/set.rb

@@ -8,6 +8,11 @@ module T
 
     check_unknown_options!
 
+    class_option "host", :aliases => "-H", :type => :string, :default => T::Requestable::DEFAULT_HOST, :desc => "Twitter API server"
+    class_option "no-color", :aliases => "-N", :type => :boolean, :desc => "Disable colorization in output"
+    class_option "no-ssl", :aliases => "-U", :type => :boolean, :default => false, :desc => "Disable SSL"
+    class_option "profile", :aliases => "-P", :type => :string, :default => File.join(File.expand_path("~"), T::RCFile::FILE_NAME), :desc => "Path to RC file", :banner => "FILE"
+
     def initialize(*)
       @rcfile = T::RCFile.instance
       super

data/lib/t/stream.rb

@@ -5,14 +5,22 @@ require 't/rcfile'
 module T
   class Stream < Thor
     include T::Printable
+    include T::Utils
 
-    STATUS_HEADINGS_FORMATTING = [
+    TWEET_HEADINGS_FORMATTING = [
       "%-18s",  # Add padding to maximum length of a Tweet ID
       "%-12s",  # Add padding to length of a timestamp formatted with ls_formatted_time
       "%-20s",  # Add padding to maximum length of a Twitter screen name
       "%s",     # Last element does not need special formatting
     ]
 
+    check_unknown_options!
+
+    class_option "host", :aliases => "-H", :type => :string, :default => T::Requestable::DEFAULT_HOST, :desc => "Twitter API server"
+    class_option "no-color", :aliases => "-N", :type => :boolean, :desc => "Disable colorization in output"
+    class_option "no-ssl", :aliases => "-U", :type => :boolean, :default => false, :desc => "Disable SSL"
+    class_option "profile", :aliases => "-P", :type => :string, :default => File.join(File.expand_path("~"), T::RCFile::FILE_NAME), :desc => "Path to RC file", :banner => "FILE"
+
     def initialize(*)
       @rcfile = T::RCFile.instance
       super
@@ -27,10 +35,10 @@ module T
         if options['csv']
           require 'csv'
           require 'fastercsv' unless Array.new.respond_to?(:to_csv)
-          say STATUS_HEADINGS.to_csv
+          say TWEET_HEADINGS.to_csv
         elsif options['long'] && STDOUT.tty?
-          headings = STATUS_HEADINGS.size.times.map do |index|
-            STATUS_HEADINGS_FORMATTING[index] % STATUS_HEADINGS[index]
+          headings = TWEET_HEADINGS.size.times.map do |index|
+            TWEET_HEADINGS_FORMATTING[index] % TWEET_HEADINGS[index]
           end
           print_table([headings])
         end
@@ -40,7 +48,7 @@ module T
           print_csv_tweet(tweet)
         elsif options['long']
           array = build_long_tweet(tweet).each_with_index.map do |element, index|
-            STATUS_HEADINGS_FORMATTING[index] % element
+            TWEET_HEADINGS_FORMATTING[index] % element
           end
           print_table([array], :truncate => STDOUT.tty?)
         else
@@ -70,7 +78,7 @@ module T
         search = T::Search.new
         search.options = search.options.merge(options)
         search.options = search.options.merge(:reverse => true)
-        search.options = search.options.merge(:format => STATUS_HEADINGS_FORMATTING)
+        search.options = search.options.merge(:format => TWEET_HEADINGS_FORMATTING)
         search.all(keywords.join(' OR '))
       end
       client.on_timeline_status do |tweet|
@@ -78,7 +86,7 @@ module T
           print_csv_tweet(tweet)
         elsif options['long']
           array = build_long_tweet(tweet).each_with_index.map do |element, index|
-            STATUS_HEADINGS_FORMATTING[index] % element
+            TWEET_HEADINGS_FORMATTING[index] % element
           end
           print_table([array], :truncate => STDOUT.tty?)
         else
@@ -98,7 +106,7 @@ module T
         cli = T::CLI.new
         cli.options = cli.options.merge(options)
         cli.options = cli.options.merge(:reverse => true)
-        cli.options = cli.options.merge(:format => STATUS_HEADINGS_FORMATTING)
+        cli.options = cli.options.merge(:format => TWEET_HEADINGS_FORMATTING)
         cli.timeline
       end
       client.on_timeline_status do |tweet|
@@ -106,7 +114,7 @@ module T
           print_csv_tweet(tweet)
         elsif options['long']
           array = build_long_tweet(tweet).each_with_index.map do |element, index|
-            STATUS_HEADINGS_FORMATTING[index] % element
+            TWEET_HEADINGS_FORMATTING[index] % element
           end
           print_table([array], :truncate => STDOUT.tty?)
         else
@@ -127,10 +135,10 @@ module T
         if options['csv']
           require 'csv'
           require 'fastercsv' unless Array.new.respond_to?(:to_csv)
-          say STATUS_HEADINGS.to_csv
+          say TWEET_HEADINGS.to_csv
         elsif options['long'] && STDOUT.tty?
-          headings = STATUS_HEADINGS.size.times.map do |index|
-            STATUS_HEADINGS_FORMATTING[index] % STATUS_HEADINGS[index]
+          headings = TWEET_HEADINGS.size.times.map do |index|
+            TWEET_HEADINGS_FORMATTING[index] % TWEET_HEADINGS[index]
           end
           print_table([headings])
         end
@@ -140,7 +148,7 @@ module T
           print_csv_tweet(tweet)
         elsif options['long']
           array = build_long_tweet(tweet).each_with_index.map do |element, index|
-            STATUS_HEADINGS_FORMATTING[index] % element
+            TWEET_HEADINGS_FORMATTING[index] % element
           end
           print_table([array], :truncate => STDOUT.tty?)
         else

data/lib/t/utils.rb

@@ -95,5 +95,21 @@ module T
       "#{count || 0} " + ((count == 1 || count =~ /^1(\.0+)?$/) ? singular : (plural || "#{singular}s"))
     end
 
+    def decode_full_text(tweet, decode_full_urls = false)
+      text = HTMLEntities.new.decode(tweet.full_text)
+      text = decode_urls(text, tweet.urls) if decode_full_urls
+      text
+    end
+
+    def decode_urls(full_text, url_entities)
+      return full_text if url_entities.nil?
+
+      url_entities.each do |url_hash|
+        full_text = full_text.gsub(url_hash.url, url_hash.expanded_url)
+      end
+
+      full_text
+    end
+
   end
 end

data/lib/t/version.rb

@@ -8,7 +8,7 @@ module T
 
     # @return [Integer]
     def self.minor
-      4
+      5
     end
 
     # @return [Integer]

data/spec/cli_spec.rb

@@ -32,7 +32,7 @@ describe T::CLI do
     before do
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc")
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.accounts
       expect($stdout.string).to eq <<-eos
 testcli
@@ -48,7 +48,7 @@ testcli
       stub_post("/oauth/access_token").to_return(:body => fixture("access_token"))
       stub_get("/1.1/account/verify_credentials.json").with(:query => {:include_entities => "false", :skip_status => "true"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resource" do
+    it "requests the correct resource" do
       $stdout.should_receive(:print)
       $stdin.should_receive(:gets).and_return("\n")
       $stdout.should_receive(:print).with("Enter your consumer key: ")
@@ -64,7 +64,7 @@ testcli
       expect(a_post("/oauth/access_token")).to have_been_made
       expect(a_get("/1.1/account/verify_credentials.json").with(:query => {:include_entities => "false", :skip_status => "true"})).to have_been_made
     end
-    it "should not raise error" do
+    it "does not raise error" do
       expect do
         $stdout.should_receive(:print)
         $stdin.should_receive(:gets).and_return("\n")
@@ -79,6 +79,45 @@ testcli
         @cli.authorize
       end.not_to raise_error
     end
+    context "empty RC file" do
+      before do
+        @cli.options = @cli.options.merge("profile" => project_path + "/tmp/empty", "display-url" => true)
+      end
+      after do
+        File.delete(project_path + "/tmp/empty")
+      end
+      it "requests the correct resource" do
+        $stdout.should_receive(:print)
+        $stdin.should_receive(:gets).and_return("\n")
+        $stdout.should_receive(:print).with("Enter your consumer key: ")
+        $stdin.should_receive(:gets).and_return("abc123")
+        $stdout.should_receive(:print).with("Enter your consumer secret: ")
+        $stdin.should_receive(:gets).and_return("asdfasd223sd2")
+        $stdout.should_receive(:print).with("Press [Enter] to open the Twitter app authorization page. ")
+        $stdin.should_receive(:gets).and_return("\n")
+        $stdout.should_receive(:print).with("Enter the supplied PIN: ")
+        $stdin.should_receive(:gets).and_return("1234567890")
+        @cli.authorize
+        expect(a_post("/oauth/request_token")).to have_been_made
+        expect(a_post("/oauth/access_token")).to have_been_made
+        expect(a_get("/1.1/account/verify_credentials.json").with(:query => {:include_entities => "false", :skip_status => "true"})).to have_been_made
+      end
+      it "does not raise error" do
+        expect do
+          $stdout.should_receive(:print)
+          $stdin.should_receive(:gets).and_return("\n")
+          $stdout.should_receive(:print).with("Enter your consumer key: ")
+          $stdin.should_receive(:gets).and_return("abc123")
+          $stdout.should_receive(:print).with("Enter your consumer secret: ")
+          $stdin.should_receive(:gets).and_return("asdfasd223sd2")
+          $stdout.should_receive(:print).with("Press [Enter] to open the Twitter app authorization page. ")
+          $stdin.should_receive(:gets).and_return("\n")
+          $stdout.should_receive(:print).with("Enter the supplied PIN: ")
+          $stdin.should_receive(:gets).and_return("1234567890")
+          @cli.authorize
+        end.not_to raise_error
+      end
+    end
   end
 
   describe "#block" do
@@ -86,11 +125,11 @@ testcli
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc")
       stub_post("/1.1/blocks/create.json").with(:body => {:screen_name => "sferik"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resource" do
+    it "requests the correct resource" do
       @cli.block("sferik")
       expect(a_post("/1.1/blocks/create.json").with(:body => {:screen_name => "sferik"})).to have_been_made
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.block("sferik")
       expect($stdout.string).to match /^@testcli blocked 1 user/
     end
@@ -99,7 +138,7 @@ testcli
         @cli.options = @cli.options.merge("id" => true)
         stub_post("/1.1/blocks/create.json").with(:body => {:user_id => "7505382"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.block("7505382")
         expect(a_post("/1.1/blocks/create.json").with(:body => {:user_id => "7505382"})).to have_been_made
       end
@@ -109,13 +148,13 @@ testcli
   describe "#direct_messages" do
     before do
       stub_get("/1.1/direct_messages.json").with(:query => {:count => "20"}).to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_get("/1.1/direct_messages.json").with(:query => {:count => "10", "max_id"=>"1624782205"}).to_return(:body => fixture("empty_array.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/direct_messages.json").with(:query => {:count => "10", "max_id" => "1624782205"}).to_return(:body => fixture("empty_array.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resource" do
+    it "requests the correct resource" do
       @cli.direct_messages
       expect(a_get("/1.1/direct_messages.json").with(:query => {:count => "20"})).to have_been_made
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.direct_messages
       expect($stdout.string).to eq <<-eos
 \e[1m\e[33m   @sferik\e[0m
@@ -160,7 +199,7 @@ testcli
       before do
         @cli.options = @cli.options.merge("csv" => true)
       end
-      it "should output in CSV format" do
+      it "outputs in CSV format" do
         @cli.direct_messages
         expect($stdout.string).to eq <<-eos
 ID,Posted at,Screen name,Text
@@ -181,7 +220,7 @@ ID,Posted at,Screen name,Text
       before do
         @cli.options = @cli.options.merge("long" => true)
       end
-      it "should output in long format" do
+      it "outputs in long format" do
         @cli.direct_messages
         expect($stdout.string).to eq <<-eos
 ID          Posted at     Screen name  Text
@@ -201,32 +240,26 @@ ID          Posted at     Screen name  Text
     context "--number" do
       before do
         stub_get("/1.1/direct_messages.json").with(:query => {:count => "1"}).to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1.1/direct_messages.json").with(:query => {:count => "200"}).to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1.1/direct_messages.json").with(:query => {:count => "200", :max_id => "1624782205"}).to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        (5..195).step(10).to_a.reverse.each do |count|
-          stub_get("/1.1/direct_messages.json").with(:query => {:count => count, :max_id => "1624782205"}).to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        end
+        stub_get("/1.1/direct_messages.json").with(:query => {:count => "200"}).to_return(:body => fixture("200_direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/direct_messages.json").with(:query => {:count => "1", :max_id => "235851563443306495"}).to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should limit the number of results to 1" do
+      it "limits the number of results to 1" do
         @cli.options = @cli.options.merge("number" => 1)
         @cli.direct_messages
         expect(a_get("/1.1/direct_messages.json").with(:query => {:count => "1"})).to have_been_made
       end
-      it "should limit the number of results to 345" do
-        @cli.options = @cli.options.merge("number" => 345)
+      it "limits the number of results to 201" do
+        @cli.options = @cli.options.merge("number" => 201)
         @cli.direct_messages
         expect(a_get("/1.1/direct_messages.json").with(:query => {:count => "200"})).to have_been_made
-        expect(a_get("/1.1/direct_messages.json").with(:query => {:count => "200", :max_id => "1624782205"})).to have_been_made.times(14)
-        (5..195).step(10).to_a.reverse.each do |count|
-          expect(a_get("/1.1/direct_messages.json").with(:query => {:count => count, :max_id => "1624782205"})).to have_been_made
-        end
+        expect(a_get("/1.1/direct_messages.json").with(:query => {:count => "1", :max_id => "235851563443306495"})).to have_been_made
       end
     end
     context "--reverse" do
       before do
         @cli.options = @cli.options.merge("reverse" => true)
       end
-      it "should reverse the order of the sort" do
+      it "reverses the order of the sort" do
         @cli.direct_messages
         expect($stdout.string).to eq <<-eos
 \e[1m\e[33m   @sferik\e[0m
@@ -273,13 +306,13 @@ ID          Posted at     Screen name  Text
   describe "#direct_messages_sent" do
     before do
       stub_get("/1.1/direct_messages/sent.json").with(:query => {:count => "20"}).to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_get("/1.1/direct_messages/sent.json").with(:query => {:count => "10", "max_id"=>"1624782205"}).to_return(:body => fixture("empty_array.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/direct_messages/sent.json").with(:query => {:count => "10", "max_id" => "1624782205"}).to_return(:body => fixture("empty_array.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resource" do
+    it "requests the correct resource" do
       @cli.direct_messages_sent
       expect(a_get("/1.1/direct_messages/sent.json").with(:query => {:count => "20"})).to have_been_made
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.direct_messages_sent
       expect($stdout.string).to eq <<-eos
 \e[1m\e[33m   @hurrycane\e[0m
@@ -324,7 +357,7 @@ ID          Posted at     Screen name  Text
       before do
         @cli.options = @cli.options.merge("csv" => true)
       end
-      it "should output in CSV format" do
+      it "outputs in CSV format" do
         @cli.direct_messages_sent
         expect($stdout.string).to eq <<-eos
 ID,Posted at,Screen name,Text
@@ -345,7 +378,7 @@ ID,Posted at,Screen name,Text
       before do
         @cli.options = @cli.options.merge("long" => true)
       end
-      it "should output in long format" do
+      it "outputs in long format" do
         @cli.direct_messages_sent
         expect($stdout.string).to eq <<-eos
 ID          Posted at     Screen name  Text
@@ -365,32 +398,26 @@ ID          Posted at     Screen name  Text
     context "--number" do
       before do
         stub_get("/1.1/direct_messages/sent.json").with(:query => {:count => "1"}).to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1.1/direct_messages/sent.json").with(:query => {:count => "200"}).to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1.1/direct_messages/sent.json").with(:query => {:count => "200", :max_id => "1624782205"}).to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        (5..195).step(10).to_a.reverse.each do |count|
-          stub_get("/1.1/direct_messages/sent.json").with(:query => {:count => count, :max_id => "1624782205"}).to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        end
+        stub_get("/1.1/direct_messages/sent.json").with(:query => {:count => "200"}).to_return(:body => fixture("200_direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/direct_messages/sent.json").with(:query => {:count => "1", :max_id => "235851563443306495"}).to_return(:body => fixture("direct_messages.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should limit the number of results 1" do
+      it "limits the number of results 1" do
         @cli.options = @cli.options.merge("number" => 1)
         @cli.direct_messages_sent
         expect(a_get("/1.1/direct_messages/sent.json").with(:query => {:count => "1"})).to have_been_made
       end
-      it "should limit the number of results to 345" do
-        @cli.options = @cli.options.merge("number" => 345)
+      it "limits the number of results to 201" do
+        @cli.options = @cli.options.merge("number" => 201)
         @cli.direct_messages_sent
         expect(a_get("/1.1/direct_messages/sent.json").with(:query => {:count => "200"})).to have_been_made
-        expect(a_get("/1.1/direct_messages/sent.json").with(:query => {:count => "200", :max_id => "1624782205"})).to have_been_made.times(14)
-        (5..195).step(10).to_a.reverse.each do |count|
-          expect(a_get("/1.1/direct_messages/sent.json").with(:query => {:count => count, :max_id => "1624782205"})).to have_been_made
-        end
+        expect(a_get("/1.1/direct_messages/sent.json").with(:query => {:count => "1", :max_id => "235851563443306495"})).to have_been_made
       end
     end
     context "--reverse" do
       before do
         @cli.options = @cli.options.merge("reverse" => true)
       end
-      it "should reverse the order of the sort" do
+      it "reverses the order of the sort" do
         @cli.direct_messages_sent
         expect($stdout.string).to eq <<-eos
 \e[1m\e[33m   @hurrycane\e[0m
@@ -440,13 +467,13 @@ ID          Posted at     Screen name  Text
       stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1"}).to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       stub_post("/1.1/users/lookup.json").with(:body => {:user_id => "213747670,428004849"}).to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resource" do
+    it "requests the correct resource" do
       @cli.groupies
       expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1"})).to have_been_made
       expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1"})).to have_been_made
       expect(a_post("/1.1/users/lookup.json").with(:body => {:user_id => "213747670,428004849"})).to have_been_made
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.groupies
       expect($stdout.string.chomp).to eq "pengwynn  sferik"
     end
@@ -454,7 +481,7 @@ ID          Posted at     Screen name  Text
       before do
         @cli.options = @cli.options.merge("csv" => true)
       end
-      it "should output in CSV format" do
+      it "outputs in CSV format" do
         @cli.groupies
         expect($stdout.string).to eq <<-eos
 ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
@@ -467,7 +494,7 @@ ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name
       before do
         @cli.options = @cli.options.merge("long" => true)
       end
-      it "should output in long format" do
+      it "outputs in long format" do
         @cli.groupies
         expect($stdout.string).to eq <<-eos
 ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
@@ -480,7 +507,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("reverse" => true)
       end
-      it "should reverse the order of the sort" do
+      it "reverses the order of the sort" do
         @cli.groupies
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -489,7 +516,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "favorites")
       end
-      it "should sort by number of favorites" do
+      it "sorts by number of favorites" do
         @cli.groupies
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -498,7 +525,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "followers")
       end
-      it "should sort by number of followers" do
+      it "sorts by number of followers" do
         @cli.groupies
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -507,7 +534,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "friends")
       end
-      it "should sort by number of friends" do
+      it "sorts by number of friends" do
         @cli.groupies
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -516,7 +543,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "listed")
       end
-      it "should sort by number of list memberships" do
+      it "sorts by number of list memberships" do
         @cli.groupies
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -525,7 +552,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "since")
       end
-      it "should sort by the time when Twitter acount was created" do
+      it "sorts by the time when Twitter acount was created" do
         @cli.groupies
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -534,7 +561,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "tweets")
       end
-      it "should sort by number of Tweets" do
+      it "sorts by number of Tweets" do
         @cli.groupies
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -543,7 +570,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "tweeted")
       end
-      it "should sort by the time of the last Tweet" do
+      it "sorts by the time of the last Tweet" do
         @cli.groupies
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -552,7 +579,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("unsorted" => true)
       end
-      it "should not be sorted" do
+      it "is not sorted" do
         @cli.groupies
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -562,7 +589,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         stub_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"}).to_return(:body => fixture("followers_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"}).to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.groupies("sferik")
         expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
         expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
@@ -574,7 +601,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
           stub_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :user_id => "7505382"}).to_return(:body => fixture("followers_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
           stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :user_id => "7505382"}).to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
-        it "should request the correct resource" do
+        it "requests the correct resource" do
           @cli.groupies("7505382")
           expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :user_id => "7505382"})).to have_been_made
           expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :user_id => "7505382"})).to have_been_made
@@ -589,11 +616,11 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc")
       stub_post("/1.1/direct_messages/new.json").with(:body => {:screen_name => "pengwynn", :text => "Creating a fixture for the Twitter gem"}).to_return(:body => fixture("direct_message.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resource" do
+    it "requests the correct resource" do
       @cli.dm("pengwynn", "Creating a fixture for the Twitter gem")
       expect(a_post("/1.1/direct_messages/new.json").with(:body => {:screen_name => "pengwynn", :text => "Creating a fixture for the Twitter gem"})).to have_been_made
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.dm("pengwynn", "Creating a fixture for the Twitter gem")
       expect($stdout.string.chomp).to eq "Direct Message sent from @testcli to @pengwynn."
     end
@@ -602,7 +629,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.options = @cli.options.merge("id" => true)
         stub_post("/1.1/direct_messages/new.json").with(:body => {:user_id => "14100886", :text => "Creating a fixture for the Twitter gem"}).to_return(:body => fixture("direct_message.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.dm("14100886", "Creating a fixture for the Twitter gem")
         expect(a_post("/1.1/direct_messages/new.json").with(:body => {:user_id => "14100886", :text => "Creating a fixture for the Twitter gem"})).to have_been_made
       end
@@ -614,11 +641,11 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc")
       stub_get("/1.1/lists/members/show.json").with(:query => {:owner_screen_name => "testcli", :screen_name => "testcli", :slug => "presidents"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resource" do
+    it "requests the correct resource" do
       @cli.does_contain("presidents")
       expect(a_get("/1.1/lists/members/show.json").with(:query => {:owner_screen_name => "testcli", :screen_name => "testcli", :slug => "presidents"})).to have_been_made
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.does_contain("presidents")
       expect($stdout.string.chomp).to eq "Yes, presidents contains @testcli."
     end
@@ -628,14 +655,14 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         stub_get("/1.1/users/show.json").with(:query => {:user_id => "7505382"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_get("/1.1/lists/members/show.json").with(:query => {:owner_screen_name => "testcli", :screen_name => "sferik", :slug => "presidents"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.does_contain("presidents", "7505382")
         expect(a_get("/1.1/users/show.json").with(:query => {:user_id => "7505382"})).to have_been_made
         expect(a_get("/1.1/lists/members/show.json").with(:query => {:owner_screen_name => "testcli", :screen_name => "sferik", :slug => "presidents"})).to have_been_made
       end
     end
     context "with an owner passed" do
-      it "should have the correct output" do
+      it "has the correct output" do
         @cli.does_contain("testcli/presidents", "testcli")
         expect($stdout.string.chomp).to eq "Yes, presidents contains @testcli."
       end
@@ -645,7 +672,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
           stub_get("/1.1/users/show.json").with(:query => {:user_id => "7505382"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
           stub_get("/1.1/lists/members/show.json").with(:query => {:owner_id => "7505382", :screen_name => "sferik", :slug => "presidents"}).to_return(:body => fixture("list.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
-        it "should request the correct resource" do
+        it "requests the correct resource" do
           @cli.does_contain("7505382/presidents", "7505382")
           expect(a_get("/1.1/users/show.json").with(:query => {:user_id => "7505382"})).to have_been_made
           expect(a_get("/1.1/lists/members/show.json").with(:query => {:owner_id => "7505382", :screen_name => "sferik", :slug => "presidents"})).to have_been_made
@@ -653,7 +680,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       end
     end
     context "with a user passed" do
-      it "should have the correct output" do
+      it "has the correct output" do
         @cli.does_contain("presidents", "testcli")
         expect($stdout.string.chomp).to eq "Yes, presidents contains @testcli."
       end
@@ -662,7 +689,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         stub_get("/1.1/lists/members/show.json").with(:query => {:owner_screen_name => "testcli", :screen_name => "testcli", :slug => "presidents"}).to_return(:body => fixture("not_found.json"), :status => 404, :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should exit" do
+      it "exits" do
         expect do
           @cli.does_contain("presidents")
         end.to raise_error(SystemExit)
@@ -676,11 +703,11 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc")
       stub_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "ev", :target_screen_name => "testcli"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resource" do
+    it "requests the correct resource" do
       @cli.does_follow("ev")
       expect(a_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "ev", :target_screen_name => "testcli"})).to have_been_made
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.does_follow("ev")
       expect($stdout.string.chomp).to eq "Yes, @ev follows @testcli."
     end
@@ -690,41 +717,52 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         stub_get("/1.1/users/show.json").with(:query => {:user_id => "20"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "sferik", :target_screen_name => "testcli"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.does_follow("20")
         expect(a_get("/1.1/users/show.json").with(:query => {:user_id => "20"})).to have_been_made
         expect(a_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "sferik", :target_screen_name => "testcli"})).to have_been_made
       end
+      it "has the correct output" do
+        @cli.does_follow("20")
+        expect($stdout.string.chomp).to eq "Yes, @sferik follows @testcli."
+      end
     end
     context "with a user passed" do
       before do
-        @cli.options = @cli.options.merge("id" => true)
-        stub_get("/1.1/users/show.json").with(:query => {:user_id => "0"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "sferik", :target_screen_name => "sferik"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "ev", :target_screen_name => "sferik"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "requests the correct resource" do
+        @cli.does_follow("ev", "sferik")
+        expect(a_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "ev", :target_screen_name => "sferik"})).to have_been_made
       end
-      it "should have the correct output" do
-        @cli.does_follow("ev", "testcli")
-        expect($stdout.string.chomp).to eq "Yes, @sferik follows @sferik."
+      it "has the correct output" do
+        @cli.does_follow("ev", "sferik")
+        expect($stdout.string.chomp).to eq "Yes, @ev follows @sferik."
       end
       context "--id" do
         before do
           @cli.options = @cli.options.merge("id" => true)
           stub_get("/1.1/users/show.json").with(:query => {:user_id => "20"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
           stub_get("/1.1/users/show.json").with(:query => {:user_id => "428004849"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+          stub_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "sferik", :target_screen_name => "sferik"}).to_return(:body => fixture("following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
-        it "should request the correct resource" do
+        it "requests the correct resource" do
           @cli.does_follow("20", "428004849")
           expect(a_get("/1.1/users/show.json").with(:query => {:user_id => "20"})).to have_been_made
           expect(a_get("/1.1/users/show.json").with(:query => {:user_id => "428004849"})).to have_been_made
           expect(a_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "sferik", :target_screen_name => "sferik"})).to have_been_made
         end
+        it "has the correct output" do
+          @cli.does_follow("20", "428004849")
+          expect($stdout.string.chomp).to eq "Yes, @sferik follows @sferik."
+        end
       end
     end
     context "false" do
       before do
         stub_get("/1.1/friendships/show.json").with(:query => {:source_screen_name => "ev", :target_screen_name => "testcli"}).to_return(:body => fixture("not_following.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should exit" do
+      it "exits" do
         expect do
           @cli.does_follow("ev")
         end.to raise_error(SystemExit)
@@ -738,11 +776,11 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc")
       stub_post("/1.1/favorites/create.json").with(:body => {:id => "26755176471724032"}).to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resource" do
+    it "requests the correct resource" do
       @cli.favorite("26755176471724032")
       expect(a_post("/1.1/favorites/create.json").with(:body => {:id => "26755176471724032"})).to have_been_made
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.favorite("26755176471724032")
       expect($stdout.string).to match /^@testcli favorited 1 tweet.$/
     end
@@ -752,11 +790,11 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     before do
       stub_get("/1.1/favorites/list.json").with(:query => {:count => "20"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resource" do
+    it "requests the correct resource" do
       @cli.favorites
       expect(a_get("/1.1/favorites/list.json").with(:query => {:count => "20"})).to have_been_made
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.favorites
       expect($stdout.string).to eq <<-eos
 \e[1m\e[33m   @mutgoff\e[0m
@@ -840,11 +878,11 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("csv" => true)
       end
-      it "should output in CSV format" do
+      it "outputs in CSV format" do
         @cli.favorites
         expect($stdout.string).to eq <<-eos
 ID,Posted at,Screen name,Text
-244111636544225280,2012-09-07 16:35:24 +0000,mutgoff,Happy Birthday @imdane. Watch out for those @rally pranksters!
+4611686018427387904,2012-09-07 16:35:24 +0000,mutgoff,Happy Birthday @imdane. Watch out for those @rally pranksters!
 244111183165157376,2012-09-07 16:33:36 +0000,ironicsans,"If you like good real-life stories, check out @NarrativelyNY's just-launched site http://t.co/wiUL07jE (and also visit http://t.co/ZoyQxqWA)"
 244110336414859264,2012-09-07 16:30:14 +0000,pat_shaughnessy,"Something else to vote for: ""New Rails workshops to bring more women into the Boston software scene"" http://t.co/eNBuckHc /cc @bostonrb"
 244109797308379136,2012-09-07 16:28:05 +0000,calebelston,Pushing the button to launch the site. http://t.co/qLoEn5jG
@@ -871,60 +909,60 @@ ID,Posted at,Screen name,Text
       before do
         @cli.options = @cli.options.merge("long" => true)
       end
-      it "should output in long format" do
+      it "outputs in long format" do
         @cli.favorites
         expect($stdout.string).to eq <<-eos
-ID                  Posted at     Screen name       Text
-244111636544225280  Sep  7 08:35  @mutgoff          Happy Birthday @imdane. W...
-244111183165157376  Sep  7 08:33  @ironicsans       If you like good real-lif...
-244110336414859264  Sep  7 08:30  @pat_shaughnessy  Something else to vote fo...
-244109797308379136  Sep  7 08:28  @calebelston      Pushing the button to lau...
-244108728834592770  Sep  7 08:23  @calebelston      RT @olivercameron: Mosaic...
-244107890632294400  Sep  7 08:20  @fivethirtyeight  The Weatherman is Not a M...
-244107823733174272  Sep  7 08:20  @codeforamerica   RT @randomhacks: Going to...
-244107236262170624  Sep  7 08:17  @fbjork           RT @jondot: Just publishe...
-244106476048764928  Sep  7 08:14  @mbostock         If you are wondering how ...
-244105599351148544  Sep  7 08:11  @FakeDorsey       “Write drunk. Edit sober....
-244104558433951744  Sep  7 08:07  @al3x             RT @wcmaier: Better banki...
-244104146997870594  Sep  7 08:05  @calebelston      We just announced Mosaic,...
-244103057175113729  Sep  7 08:01  @BarackObama      Donate $10 or more --> ge...
-244102834398851073  Sep  7 08:00  @JEG2             RT @tenderlove: If corpor...
-244102741125890048  Sep  7 08:00  @eveningedition   LDN—Obama's nomination; P...
-244102729860009984  Sep  7 08:00  @dhh              RT @ggreenwald: Democrats...
-244102490646278146  Sep  7 07:59  @jasonfried       The story of Mars Curiosi...
-244102209942458368  Sep  7 07:57  @sferik           @episod @twitterapi now h...
-244100411563339777  Sep  7 07:50  @sferik           @episod @twitterapi Did y...
-244099460672679938  Sep  7 07:47  @dwiskus          Gentlemen, you can't figh...
+ID                   Posted at     Screen name       Text
+4611686018427387904  Sep  7 08:35  @mutgoff          Happy Birthday @imdane. ...
+ 244111183165157376  Sep  7 08:33  @ironicsans       If you like good real-li...
+ 244110336414859264  Sep  7 08:30  @pat_shaughnessy  Something else to vote f...
+ 244109797308379136  Sep  7 08:28  @calebelston      Pushing the button to la...
+ 244108728834592770  Sep  7 08:23  @calebelston      RT @olivercameron: Mosai...
+ 244107890632294400  Sep  7 08:20  @fivethirtyeight  The Weatherman is Not a ...
+ 244107823733174272  Sep  7 08:20  @codeforamerica   RT @randomhacks: Going t...
+ 244107236262170624  Sep  7 08:17  @fbjork           RT @jondot: Just publish...
+ 244106476048764928  Sep  7 08:14  @mbostock         If you are wondering how...
+ 244105599351148544  Sep  7 08:11  @FakeDorsey       “Write drunk. Edit sober...
+ 244104558433951744  Sep  7 08:07  @al3x             RT @wcmaier: Better bank...
+ 244104146997870594  Sep  7 08:05  @calebelston      We just announced Mosaic...
+ 244103057175113729  Sep  7 08:01  @BarackObama      Donate $10 or more --> g...
+ 244102834398851073  Sep  7 08:00  @JEG2             RT @tenderlove: If corpo...
+ 244102741125890048  Sep  7 08:00  @eveningedition   LDN—Obama's nomination; ...
+ 244102729860009984  Sep  7 08:00  @dhh              RT @ggreenwald: Democrat...
+ 244102490646278146  Sep  7 07:59  @jasonfried       The story of Mars Curios...
+ 244102209942458368  Sep  7 07:57  @sferik           @episod @twitterapi now ...
+ 244100411563339777  Sep  7 07:50  @sferik           @episod @twitterapi Did ...
+ 244099460672679938  Sep  7 07:47  @dwiskus          Gentlemen, you can't fig...
         eos
       end
       context "--reverse" do
         before do
           @cli.options = @cli.options.merge("reverse" => true)
         end
-        it "should reverse the order of the sort" do
+        it "reverses the order of the sort" do
           @cli.favorites
           expect($stdout.string).to eq <<-eos
-ID                  Posted at     Screen name       Text
-244099460672679938  Sep  7 07:47  @dwiskus          Gentlemen, you can't figh...
-244100411563339777  Sep  7 07:50  @sferik           @episod @twitterapi Did y...
-244102209942458368  Sep  7 07:57  @sferik           @episod @twitterapi now h...
-244102490646278146  Sep  7 07:59  @jasonfried       The story of Mars Curiosi...
-244102729860009984  Sep  7 08:00  @dhh              RT @ggreenwald: Democrats...
-244102741125890048  Sep  7 08:00  @eveningedition   LDN—Obama's nomination; P...
-244102834398851073  Sep  7 08:00  @JEG2             RT @tenderlove: If corpor...
-244103057175113729  Sep  7 08:01  @BarackObama      Donate $10 or more --> ge...
-244104146997870594  Sep  7 08:05  @calebelston      We just announced Mosaic,...
-244104558433951744  Sep  7 08:07  @al3x             RT @wcmaier: Better banki...
-244105599351148544  Sep  7 08:11  @FakeDorsey       “Write drunk. Edit sober....
-244106476048764928  Sep  7 08:14  @mbostock         If you are wondering how ...
-244107236262170624  Sep  7 08:17  @fbjork           RT @jondot: Just publishe...
-244107823733174272  Sep  7 08:20  @codeforamerica   RT @randomhacks: Going to...
-244107890632294400  Sep  7 08:20  @fivethirtyeight  The Weatherman is Not a M...
-244108728834592770  Sep  7 08:23  @calebelston      RT @olivercameron: Mosaic...
-244109797308379136  Sep  7 08:28  @calebelston      Pushing the button to lau...
-244110336414859264  Sep  7 08:30  @pat_shaughnessy  Something else to vote fo...
-244111183165157376  Sep  7 08:33  @ironicsans       If you like good real-lif...
-244111636544225280  Sep  7 08:35  @mutgoff          Happy Birthday @imdane. W...
+ID                   Posted at     Screen name       Text
+ 244099460672679938  Sep  7 07:47  @dwiskus          Gentlemen, you can't fig...
+ 244100411563339777  Sep  7 07:50  @sferik           @episod @twitterapi Did ...
+ 244102209942458368  Sep  7 07:57  @sferik           @episod @twitterapi now ...
+ 244102490646278146  Sep  7 07:59  @jasonfried       The story of Mars Curios...
+ 244102729860009984  Sep  7 08:00  @dhh              RT @ggreenwald: Democrat...
+ 244102741125890048  Sep  7 08:00  @eveningedition   LDN—Obama's nomination; ...
+ 244102834398851073  Sep  7 08:00  @JEG2             RT @tenderlove: If corpo...
+ 244103057175113729  Sep  7 08:01  @BarackObama      Donate $10 or more --> g...
+ 244104146997870594  Sep  7 08:05  @calebelston      We just announced Mosaic...
+ 244104558433951744  Sep  7 08:07  @al3x             RT @wcmaier: Better bank...
+ 244105599351148544  Sep  7 08:11  @FakeDorsey       “Write drunk. Edit sober...
+ 244106476048764928  Sep  7 08:14  @mbostock         If you are wondering how...
+ 244107236262170624  Sep  7 08:17  @fbjork           RT @jondot: Just publish...
+ 244107823733174272  Sep  7 08:20  @codeforamerica   RT @randomhacks: Going t...
+ 244107890632294400  Sep  7 08:20  @fivethirtyeight  The Weatherman is Not a ...
+ 244108728834592770  Sep  7 08:23  @calebelston      RT @olivercameron: Mosai...
+ 244109797308379136  Sep  7 08:28  @calebelston      Pushing the button to la...
+ 244110336414859264  Sep  7 08:30  @pat_shaughnessy  Something else to vote f...
+ 244111183165157376  Sep  7 08:33  @ironicsans       If you like good real-li...
+4611686018427387904  Sep  7 08:35  @mutgoff          Happy Birthday @imdane. ...
           eos
         end
       end
@@ -932,32 +970,26 @@ ID                  Posted at     Screen name       Text
     context "--number" do
       before do
         stub_get("/1.1/favorites/list.json").with(:query => {:count => "1"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1.1/favorites/list.json").with(:query => {:count => "200"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1.1/favorites/list.json").with(:query => {:count => "200", :max_id => "244099460672679937"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        (5..185).step(20).to_a.reverse.each do |count|
-          stub_get("/1.1/favorites/list.json").with(:query => {:count => count, :max_id => "244099460672679937"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        end
+        stub_get("/1.1/favorites/list.json").with(:query => {:count => "200"}).to_return(:body => fixture("200_statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/favorites/list.json").with(:query => {:count => "1", :max_id => "265500541700956160"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should limit the number of results to 1" do
+      it "limits the number of results to 1" do
         @cli.options = @cli.options.merge("number" => 1)
         @cli.favorites
         expect(a_get("/1.1/favorites/list.json").with(:query => {:count => "1"})).to have_been_made
       end
-      it "should limit the number of results to 345" do
-        @cli.options = @cli.options.merge("number" => 345)
+      it "limits the number of results to 201" do
+        @cli.options = @cli.options.merge("number" => 201)
         @cli.favorites
         expect(a_get("/1.1/favorites/list.json").with(:query => {:count => "200"})).to have_been_made
-        expect(a_get("/1.1/favorites/list.json").with(:query => {:count => "200", :max_id => "244099460672679937"})).to have_been_made.times(7)
-        (5..185).step(20).to_a.reverse.each do |count|
-          expect(a_get("/1.1/favorites/list.json").with(:query => {:count => count, :max_id => "244099460672679937"})).to have_been_made
-        end
+        expect(a_get("/1.1/favorites/list.json").with(:query => {:count => "1", :max_id => "265500541700956160"})).to have_been_made
       end
     end
     context "with a user passed" do
       before do
         stub_get("/1.1/favorites/list.json").with(:query => {:count => "20", :screen_name => "sferik"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.favorites("sferik")
         expect(a_get("/1.1/favorites/list.json").with(:query => {:count => "20", :screen_name => "sferik"})).to have_been_made
       end
@@ -966,7 +998,7 @@ ID                  Posted at     Screen name       Text
           @cli.options = @cli.options.merge("id" => true)
           stub_get("/1.1/favorites/list.json").with(:query => {:user_id => "7505382", :count => "20"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
-        it "should request the correct resource" do
+        it "requests the correct resource" do
           @cli.favorites("7505382")
           expect(a_get("/1.1/favorites/list.json").with(:query => {:user_id => "7505382", :count => "20"})).to have_been_made
         end
@@ -984,13 +1016,13 @@ ID                  Posted at     Screen name       Text
         stub_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik,pengwynn"}).to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_post("/1.1/friendships/create.json").with(:body => {:user_id => "14100886"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.follow("sferik", "pengwynn")
         expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1"})).to have_been_made
         expect(a_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik,pengwynn"})).to have_been_made
         expect(a_post("/1.1/friendships/create.json").with(:body => {:user_id => "14100886"})).to have_been_made
       end
-      it "should have the correct output" do
+      it "has the correct output" do
         @cli.follow("sferik", "pengwynn")
         expect($stdout.string).to match /^@testcli is now following 1 more user\.$/
       end
@@ -1001,7 +1033,7 @@ ID                  Posted at     Screen name       Text
           stub_post("/1.1/users/lookup.json").with(:body => {:user_id => "7505382,14100886"}).to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
           stub_post("/1.1/friendships/create.json").with(:body => {:user_id => "14100886"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
-        it "should request the correct resource" do
+        it "requests the correct resource" do
           @cli.follow("7505382", "14100886")
           expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1"})).to have_been_made
           expect(a_post("/1.1/users/lookup.json").with(:body => {:user_id => "7505382,14100886"})).to have_been_made
@@ -1009,7 +1041,7 @@ ID                  Posted at     Screen name       Text
         end
       end
       context "Twitter is down" do
-        it "should retry 3 times and then raise an error" do
+        it "retries 3 times and then raise an error" do
           stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1"}).to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
           stub_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik,pengwynn"}).to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
           stub_post("/1.1/friendships/create.json").with(:body => {:user_id => "14100886"}).to_return(:status => 502)
@@ -1029,12 +1061,12 @@ ID                  Posted at     Screen name       Text
       stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1"}).to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       stub_post("/1.1/users/lookup.json").with(:body => {:user_id => "7505382"}).to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resource" do
+    it "requests the correct resource" do
       @cli.followings
       expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1"})).to have_been_made
       expect(a_post("/1.1/users/lookup.json").with(:body => {:user_id => "7505382"})).to have_been_made
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.followings
       expect($stdout.string.chomp).to eq "pengwynn  sferik"
     end
@@ -1042,7 +1074,7 @@ ID                  Posted at     Screen name       Text
       before do
         @cli.options = @cli.options.merge("csv" => true)
       end
-      it "should output in CSV format" do
+      it "outputs in CSV format" do
         @cli.followings
         expect($stdout.string).to eq <<-eos
 ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
@@ -1055,7 +1087,7 @@ ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name
       before do
         @cli.options = @cli.options.merge("long" => true)
       end
-      it "should output in long format" do
+      it "outputs in long format" do
         @cli.followings
         expect($stdout.string).to eq <<-eos
 ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
@@ -1068,7 +1100,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("reverse" => true)
       end
-      it "should reverse the order of the sort" do
+      it "reverses the order of the sort" do
         @cli.followings
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -1077,7 +1109,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "favorites")
       end
-      it "should sort by number of favorites" do
+      it "sorts by number of favorites" do
         @cli.followings
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -1086,7 +1118,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "followers")
       end
-      it "should sort by number of followers" do
+      it "sorts by number of followers" do
         @cli.followings
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -1095,7 +1127,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "friends")
       end
-      it "should sort by number of friends" do
+      it "sorts by number of friends" do
         @cli.followings
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -1104,7 +1136,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "listed")
       end
-      it "should sort by number of list memberships" do
+      it "sorts by number of list memberships" do
         @cli.followings
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -1113,7 +1145,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "since")
       end
-      it "should sort by the time when Twitter acount was created" do
+      it "sorts by the time when Twitter acount was created" do
         @cli.followings
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -1122,7 +1154,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "tweets")
       end
-      it "should sort by number of Tweets" do
+      it "sorts by number of Tweets" do
         @cli.followings
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -1131,7 +1163,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "tweeted")
       end
-      it "should sort by the time of the last Tweet" do
+      it "sorts by the time of the last Tweet" do
         @cli.followings
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -1140,7 +1172,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("unsorted" => true)
       end
-      it "should not be sorted" do
+      it "is not sorted" do
         @cli.followings
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -1149,7 +1181,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"}).to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.followings("sferik")
         expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
         expect(a_post("/1.1/users/lookup.json").with(:body => {:user_id => "7505382"})).to have_been_made
@@ -1160,7 +1192,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.options = @cli.options.merge("id" => true)
         stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :user_id => "7505382"}).to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.followings("7505382")
         expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :user_id => "7505382"})).to have_been_made
         expect(a_post("/1.1/users/lookup.json").with(:body => {:user_id => "7505382"})).to have_been_made
@@ -1173,12 +1205,12 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       stub_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1"}).to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       stub_post("/1.1/users/lookup.json").with(:body => {:user_id => "7505382"}).to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resource" do
+    it "requests the correct resource" do
       @cli.followers
       expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1"})).to have_been_made
       expect(a_post("/1.1/users/lookup.json").with(:body => {:user_id => "7505382"})).to have_been_made
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.followers
       expect($stdout.string.chomp).to eq "pengwynn  sferik"
     end
@@ -1186,7 +1218,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("csv" => true)
       end
-      it "should output in CSV format" do
+      it "outputs in CSV format" do
         @cli.followers
         expect($stdout.string).to eq <<-eos
 ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
@@ -1199,7 +1231,7 @@ ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name
       before do
         @cli.options = @cli.options.merge("long" => true)
       end
-      it "should output in long format" do
+      it "outputs in long format" do
         @cli.followers
         expect($stdout.string).to eq <<-eos
 ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
@@ -1212,7 +1244,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("reverse" => true)
       end
-      it "should reverse the order of the sort" do
+      it "reverses the order of the sort" do
         @cli.followers
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -1221,7 +1253,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "favorites")
       end
-      it "should sort by number of favorites" do
+      it "sorts by number of favorites" do
         @cli.followers
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -1230,7 +1262,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "followers")
       end
-      it "should sort by number of followers" do
+      it "sorts by number of followers" do
         @cli.followers
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -1239,7 +1271,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "friends")
       end
-      it "should sort by number of friends" do
+      it "sorts by number of friends" do
         @cli.followers
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -1248,7 +1280,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "listed")
       end
-      it "should sort by number of list memberships" do
+      it "sorts by number of list memberships" do
         @cli.followers
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -1257,7 +1289,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "since")
       end
-      it "should sort by the time when Twitter acount was created" do
+      it "sorts by the time when Twitter acount was created" do
         @cli.followers
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -1266,7 +1298,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "tweets")
       end
-      it "should sort by number of Tweets" do
+      it "sorts by number of Tweets" do
         @cli.followers
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -1275,7 +1307,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "tweeted")
       end
-      it "should sort by the time of the last Tweet" do
+      it "sorts by the time of the last Tweet" do
         @cli.followers
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -1284,7 +1316,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("unsorted" => true)
       end
-      it "should not be sorted" do
+      it "is not sorted" do
         @cli.followers
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -1294,7 +1326,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         stub_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"}).to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_post("/1.1/users/lookup.json").with(:body => {:user_id => "213747670,428004849"}).to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.followers("sferik")
         expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
         expect(a_post("/1.1/users/lookup.json").with(:body => {:user_id => "7505382"})).to have_been_made
@@ -1304,7 +1336,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
           @cli.options = @cli.options.merge("id" => true)
           stub_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :user_id => "7505382"}).to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
-        it "should request the correct resource" do
+        it "requests the correct resource" do
           @cli.followers("7505382")
           expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :user_id => "7505382"})).to have_been_made
           expect(a_post("/1.1/users/lookup.json").with(:body => {:user_id => "7505382"})).to have_been_made
@@ -1319,13 +1351,13 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       stub_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1"}).to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       stub_post("/1.1/users/lookup.json").with(:body => {:user_id => "7505382"}).to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resource" do
+    it "requests the correct resource" do
       @cli.friends
       expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1"})).to have_been_made
       expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1"})).to have_been_made
       expect(a_post("/1.1/users/lookup.json").with(:body => {:user_id => "7505382"})).to have_been_made
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.friends
       expect($stdout.string.chomp).to eq "pengwynn  sferik"
     end
@@ -1333,7 +1365,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("csv" => true)
       end
-      it "should output in CSV format" do
+      it "outputs in CSV format" do
         @cli.friends
         expect($stdout.string).to eq <<-eos
 ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
@@ -1346,7 +1378,7 @@ ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name
       before do
         @cli.options = @cli.options.merge("long" => true)
       end
-      it "should output in long format" do
+      it "outputs in long format" do
         @cli.friends
         expect($stdout.string).to eq <<-eos
 ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
@@ -1359,7 +1391,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("reverse" => true)
       end
-      it "should reverse the order of the sort" do
+      it "reverses the order of the sort" do
         @cli.friends
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -1368,7 +1400,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "favorites")
       end
-      it "should sort by number of favorites" do
+      it "sorts by number of favorites" do
         @cli.friends
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -1377,7 +1409,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "followers")
       end
-      it "should sort by number of followers" do
+      it "sorts by number of followers" do
         @cli.friends
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -1386,7 +1418,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "friends")
       end
-      it "should sort by number of friends" do
+      it "sorts by number of friends" do
         @cli.friends
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -1395,7 +1427,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "listed")
       end
-      it "should sort by number of list memberships" do
+      it "sorts by number of list memberships" do
         @cli.friends
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -1404,7 +1436,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "since")
       end
-      it "should sort by the time when Twitter acount was created" do
+      it "sorts by the time when Twitter acount was created" do
         @cli.friends
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -1413,7 +1445,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "tweets")
       end
-      it "should sort by number of Tweets" do
+      it "sorts by number of Tweets" do
         @cli.friends
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -1422,7 +1454,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "tweeted")
       end
-      it "should sort by the time of the last Tweet" do
+      it "sorts by the time of the last Tweet" do
         @cli.friends
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -1431,7 +1463,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("unsorted" => true)
       end
-      it "should not be sorted" do
+      it "is not sorted" do
         @cli.friends
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -1441,7 +1473,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"}).to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"}).to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.friends("sferik")
         expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
         expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
@@ -1453,7 +1485,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
           stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :user_id => "7505382"}).to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
           stub_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :user_id => "7505382"}).to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
-        it "should request the correct resource" do
+        it "requests the correct resource" do
           @cli.friends("7505382")
           expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :user_id => "7505382"})).to have_been_made
           expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :user_id => "7505382"})).to have_been_made
@@ -1469,13 +1501,13 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       stub_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1"}).to_return(:body => fixture("followers_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       stub_post("/1.1/users/lookup.json").with(:body => {:user_id => "7505382"}).to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resource" do
+    it "requests the correct resource" do
       @cli.leaders
       expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1"})).to have_been_made
       expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1"})).to have_been_made
       expect(a_post("/1.1/users/lookup.json").with(:body => {:user_id => "7505382"})).to have_been_made
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.leaders
       expect($stdout.string.chomp).to eq "pengwynn  sferik"
     end
@@ -1483,7 +1515,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("csv" => true)
       end
-      it "should output in CSV format" do
+      it "outputs in CSV format" do
         @cli.leaders
         expect($stdout.string).to eq <<-eos
 ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
@@ -1496,7 +1528,7 @@ ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name
       before do
         @cli.options = @cli.options.merge("long" => true)
       end
-      it "should output in long format" do
+      it "outputs in long format" do
         @cli.leaders
         expect($stdout.string).to eq <<-eos
 ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
@@ -1509,7 +1541,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("reverse" => true)
       end
-      it "should reverse the order of the sort" do
+      it "reverses the order of the sort" do
         @cli.leaders
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -1518,7 +1550,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "favorites")
       end
-      it "should sort by number of favorites" do
+      it "sorts by number of favorites" do
         @cli.leaders
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -1527,7 +1559,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "followers")
       end
-      it "should sort by number of followers" do
+      it "sorts by number of followers" do
         @cli.leaders
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -1536,7 +1568,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "friends")
       end
-      it "should sort by number of friends" do
+      it "sorts by number of friends" do
         @cli.leaders
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -1545,7 +1577,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "listed")
       end
-      it "should sort by number of list memberships" do
+      it "sorts by number of list memberships" do
         @cli.leaders
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -1554,7 +1586,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "since")
       end
-      it "should sort by the time when Twitter acount was created" do
+      it "sorts by the time when Twitter acount was created" do
         @cli.leaders
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -1563,7 +1595,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "tweets")
       end
-      it "should sort by number of Tweets" do
+      it "sorts by number of Tweets" do
         @cli.leaders
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -1572,7 +1604,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "tweeted")
       end
-      it "should sort by the time of the last Tweet" do
+      it "sorts by the time of the last Tweet" do
         @cli.leaders
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -1581,7 +1613,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("unsorted" => true)
       end
-      it "should not be sorted" do
+      it "is not sorted" do
         @cli.leaders
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -1591,7 +1623,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"}).to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"}).to_return(:body => fixture("followers_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.leaders("sferik")
         expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
         expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :screen_name => "sferik"})).to have_been_made
@@ -1603,7 +1635,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
           stub_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :user_id => "7505382"}).to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
           stub_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :user_id => "7505382"}).to_return(:body => fixture("followers_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
-        it "should request the correct resource" do
+        it "requests the correct resource" do
           @cli.leaders("7505382")
           expect(a_get("/1.1/friends/ids.json").with(:query => {:cursor => "-1", :user_id => "7505382"})).to have_been_made
           expect(a_get("/1.1/followers/ids.json").with(:query => {:cursor => "-1", :user_id => "7505382"})).to have_been_made
@@ -1617,11 +1649,11 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     before do
       stub_get("/1.1/lists/list.json").to_return(:body => fixture("lists.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resource" do
+    it "requests the correct resource" do
       @cli.lists
       expect(a_get("/1.1/lists/list.json")).to have_been_made
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.lists
       expect($stdout.string.chomp).to eq "@pengwynn/rubyists  @twitter/team       @sferik/test"
     end
@@ -1629,7 +1661,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("csv" => true)
       end
-      it "should output in CSV format" do
+      it "outputs in CSV format" do
         @cli.lists
         expect($stdout.string).to eq <<-eos
 ID,Created at,Screen name,Slug,Members,Subscribers,Mode,Description
@@ -1643,7 +1675,7 @@ ID,Created at,Screen name,Slug,Members,Subscribers,Mode,Description
       before do
         @cli.options = @cli.options.merge("long" => true)
       end
-      it "should output in long format" do
+      it "outputs in long format" do
         @cli.lists
         expect($stdout.string).to eq <<-eos
 ID        Created at    Screen name  Slug      Members  Subscribers  Mode    ...
@@ -1657,7 +1689,7 @@ ID        Created at    Screen name  Slug      Members  Subscribers  Mode    ...
       before do
         @cli.options = @cli.options.merge("reverse" => true)
       end
-      it "should reverse the order of the sort" do
+      it "reverses the order of the sort" do
         @cli.lists
         expect($stdout.string.chomp).to eq "@sferik/test        @twitter/team       @pengwynn/rubyists"
       end
@@ -1666,7 +1698,7 @@ ID        Created at    Screen name  Slug      Members  Subscribers  Mode    ...
       before do
         @cli.options = @cli.options.merge("sort" => "members")
       end
-      it "should sort by the time when Twitter acount was created" do
+      it "sorts by the time when Twitter acount was created" do
         @cli.lists
         expect($stdout.string.chomp).to eq "@sferik/test        @pengwynn/rubyists  @twitter/team"
       end
@@ -1675,7 +1707,7 @@ ID        Created at    Screen name  Slug      Members  Subscribers  Mode    ...
       before do
         @cli.options = @cli.options.merge("sort" => "mode")
       end
-      it "should sort by the time when Twitter acount was created" do
+      it "sorts by the time when Twitter acount was created" do
         @cli.lists
         expect($stdout.string.chomp).to eq "@sferik/test        @twitter/team       @pengwynn/rubyists"
       end
@@ -1684,7 +1716,7 @@ ID        Created at    Screen name  Slug      Members  Subscribers  Mode    ...
       before do
         @cli.options = @cli.options.merge("sort" => "posted")
       end
-      it "should sort by the time when Twitter acount was created" do
+      it "sorts by the time when Twitter acount was created" do
         @cli.lists
         expect($stdout.string.chomp).to eq "@twitter/team       @pengwynn/rubyists  @sferik/test"
       end
@@ -1693,7 +1725,7 @@ ID        Created at    Screen name  Slug      Members  Subscribers  Mode    ...
       before do
         @cli.options = @cli.options.merge("sort" => "subscribers")
       end
-      it "should sort by the time when Twitter acount was created" do
+      it "sorts by the time when Twitter acount was created" do
         @cli.lists
         expect($stdout.string.chomp).to eq "@sferik/test        @pengwynn/rubyists  @twitter/team"
       end
@@ -1702,7 +1734,7 @@ ID        Created at    Screen name  Slug      Members  Subscribers  Mode    ...
       before do
         @cli.options = @cli.options.merge("unsorted" => true)
       end
-      it "should not be sorted" do
+      it "is not sorted" do
         @cli.lists
         expect($stdout.string.chomp).to eq "@pengwynn/rubyists  @twitter/team       @sferik/test"
       end
@@ -1711,7 +1743,7 @@ ID        Created at    Screen name  Slug      Members  Subscribers  Mode    ...
       before do
         stub_get("/1.1/lists/list.json").with(:query => {:screen_name => "sferik"}).to_return(:body => fixture("lists.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.lists("sferik")
         expect(a_get("/1.1/lists/list.json").with(:query => {:screen_name => "sferik"})).to have_been_made
       end
@@ -1720,7 +1752,7 @@ ID        Created at    Screen name  Slug      Members  Subscribers  Mode    ...
           @cli.options = @cli.options.merge("id" => true)
           stub_get("/1.1/lists/list.json").with(:query => {:user_id => "7505382"}).to_return(:body => fixture("lists.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
-        it "should request the correct resource" do
+        it "requests the correct resource" do
           @cli.lists("7505382")
           expect(a_get("/1.1/lists/list.json").with(:query => {:user_id => "7505382"})).to have_been_made
         end
@@ -1732,11 +1764,11 @@ ID        Created at    Screen name  Slug      Members  Subscribers  Mode    ...
     before do
       stub_get("/1.1/statuses/mentions_timeline.json").with(:query => {:count => "20"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resource" do
+    it "requests the correct resource" do
       @cli.mentions
       expect(a_get("/1.1/statuses/mentions_timeline.json").with(:query => {:count => "20"})).to have_been_made
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.mentions
       expect($stdout.string).to eq <<-eos
 \e[1m\e[33m   @mutgoff\e[0m
@@ -1820,11 +1852,11 @@ ID        Created at    Screen name  Slug      Members  Subscribers  Mode    ...
       before do
         @cli.options = @cli.options.merge("csv" => true)
       end
-      it "should output in CSV format" do
+      it "outputs in CSV format" do
         @cli.mentions
         expect($stdout.string).to eq <<-eos
 ID,Posted at,Screen name,Text
-244111636544225280,2012-09-07 16:35:24 +0000,mutgoff,Happy Birthday @imdane. Watch out for those @rally pranksters!
+4611686018427387904,2012-09-07 16:35:24 +0000,mutgoff,Happy Birthday @imdane. Watch out for those @rally pranksters!
 244111183165157376,2012-09-07 16:33:36 +0000,ironicsans,"If you like good real-life stories, check out @NarrativelyNY's just-launched site http://t.co/wiUL07jE (and also visit http://t.co/ZoyQxqWA)"
 244110336414859264,2012-09-07 16:30:14 +0000,pat_shaughnessy,"Something else to vote for: ""New Rails workshops to bring more women into the Boston software scene"" http://t.co/eNBuckHc /cc @bostonrb"
 244109797308379136,2012-09-07 16:28:05 +0000,calebelston,Pushing the button to launch the site. http://t.co/qLoEn5jG
@@ -1851,60 +1883,60 @@ ID,Posted at,Screen name,Text
       before do
         @cli.options = @cli.options.merge("long" => true)
       end
-      it "should output in long format" do
+      it "outputs in long format" do
         @cli.mentions
         expect($stdout.string).to eq <<-eos
-ID                  Posted at     Screen name       Text
-244111636544225280  Sep  7 08:35  @mutgoff          Happy Birthday @imdane. W...
-244111183165157376  Sep  7 08:33  @ironicsans       If you like good real-lif...
-244110336414859264  Sep  7 08:30  @pat_shaughnessy  Something else to vote fo...
-244109797308379136  Sep  7 08:28  @calebelston      Pushing the button to lau...
-244108728834592770  Sep  7 08:23  @calebelston      RT @olivercameron: Mosaic...
-244107890632294400  Sep  7 08:20  @fivethirtyeight  The Weatherman is Not a M...
-244107823733174272  Sep  7 08:20  @codeforamerica   RT @randomhacks: Going to...
-244107236262170624  Sep  7 08:17  @fbjork           RT @jondot: Just publishe...
-244106476048764928  Sep  7 08:14  @mbostock         If you are wondering how ...
-244105599351148544  Sep  7 08:11  @FakeDorsey       “Write drunk. Edit sober....
-244104558433951744  Sep  7 08:07  @al3x             RT @wcmaier: Better banki...
-244104146997870594  Sep  7 08:05  @calebelston      We just announced Mosaic,...
-244103057175113729  Sep  7 08:01  @BarackObama      Donate $10 or more --> ge...
-244102834398851073  Sep  7 08:00  @JEG2             RT @tenderlove: If corpor...
-244102741125890048  Sep  7 08:00  @eveningedition   LDN—Obama's nomination; P...
-244102729860009984  Sep  7 08:00  @dhh              RT @ggreenwald: Democrats...
-244102490646278146  Sep  7 07:59  @jasonfried       The story of Mars Curiosi...
-244102209942458368  Sep  7 07:57  @sferik           @episod @twitterapi now h...
-244100411563339777  Sep  7 07:50  @sferik           @episod @twitterapi Did y...
-244099460672679938  Sep  7 07:47  @dwiskus          Gentlemen, you can't figh...
+ID                   Posted at     Screen name       Text
+4611686018427387904  Sep  7 08:35  @mutgoff          Happy Birthday @imdane. ...
+ 244111183165157376  Sep  7 08:33  @ironicsans       If you like good real-li...
+ 244110336414859264  Sep  7 08:30  @pat_shaughnessy  Something else to vote f...
+ 244109797308379136  Sep  7 08:28  @calebelston      Pushing the button to la...
+ 244108728834592770  Sep  7 08:23  @calebelston      RT @olivercameron: Mosai...
+ 244107890632294400  Sep  7 08:20  @fivethirtyeight  The Weatherman is Not a ...
+ 244107823733174272  Sep  7 08:20  @codeforamerica   RT @randomhacks: Going t...
+ 244107236262170624  Sep  7 08:17  @fbjork           RT @jondot: Just publish...
+ 244106476048764928  Sep  7 08:14  @mbostock         If you are wondering how...
+ 244105599351148544  Sep  7 08:11  @FakeDorsey       “Write drunk. Edit sober...
+ 244104558433951744  Sep  7 08:07  @al3x             RT @wcmaier: Better bank...
+ 244104146997870594  Sep  7 08:05  @calebelston      We just announced Mosaic...
+ 244103057175113729  Sep  7 08:01  @BarackObama      Donate $10 or more --> g...
+ 244102834398851073  Sep  7 08:00  @JEG2             RT @tenderlove: If corpo...
+ 244102741125890048  Sep  7 08:00  @eveningedition   LDN—Obama's nomination; ...
+ 244102729860009984  Sep  7 08:00  @dhh              RT @ggreenwald: Democrat...
+ 244102490646278146  Sep  7 07:59  @jasonfried       The story of Mars Curios...
+ 244102209942458368  Sep  7 07:57  @sferik           @episod @twitterapi now ...
+ 244100411563339777  Sep  7 07:50  @sferik           @episod @twitterapi Did ...
+ 244099460672679938  Sep  7 07:47  @dwiskus          Gentlemen, you can't fig...
         eos
       end
       context "--reverse" do
         before do
           @cli.options = @cli.options.merge("reverse" => true)
         end
-        it "should reverse the order of the sort" do
+        it "reverses the order of the sort" do
           @cli.mentions
           expect($stdout.string).to eq <<-eos
-ID                  Posted at     Screen name       Text
-244099460672679938  Sep  7 07:47  @dwiskus          Gentlemen, you can't figh...
-244100411563339777  Sep  7 07:50  @sferik           @episod @twitterapi Did y...
-244102209942458368  Sep  7 07:57  @sferik           @episod @twitterapi now h...
-244102490646278146  Sep  7 07:59  @jasonfried       The story of Mars Curiosi...
-244102729860009984  Sep  7 08:00  @dhh              RT @ggreenwald: Democrats...
-244102741125890048  Sep  7 08:00  @eveningedition   LDN—Obama's nomination; P...
-244102834398851073  Sep  7 08:00  @JEG2             RT @tenderlove: If corpor...
-244103057175113729  Sep  7 08:01  @BarackObama      Donate $10 or more --> ge...
-244104146997870594  Sep  7 08:05  @calebelston      We just announced Mosaic,...
-244104558433951744  Sep  7 08:07  @al3x             RT @wcmaier: Better banki...
-244105599351148544  Sep  7 08:11  @FakeDorsey       “Write drunk. Edit sober....
-244106476048764928  Sep  7 08:14  @mbostock         If you are wondering how ...
-244107236262170624  Sep  7 08:17  @fbjork           RT @jondot: Just publishe...
-244107823733174272  Sep  7 08:20  @codeforamerica   RT @randomhacks: Going to...
-244107890632294400  Sep  7 08:20  @fivethirtyeight  The Weatherman is Not a M...
-244108728834592770  Sep  7 08:23  @calebelston      RT @olivercameron: Mosaic...
-244109797308379136  Sep  7 08:28  @calebelston      Pushing the button to lau...
-244110336414859264  Sep  7 08:30  @pat_shaughnessy  Something else to vote fo...
-244111183165157376  Sep  7 08:33  @ironicsans       If you like good real-lif...
-244111636544225280  Sep  7 08:35  @mutgoff          Happy Birthday @imdane. W...
+ID                   Posted at     Screen name       Text
+ 244099460672679938  Sep  7 07:47  @dwiskus          Gentlemen, you can't fig...
+ 244100411563339777  Sep  7 07:50  @sferik           @episod @twitterapi Did ...
+ 244102209942458368  Sep  7 07:57  @sferik           @episod @twitterapi now ...
+ 244102490646278146  Sep  7 07:59  @jasonfried       The story of Mars Curios...
+ 244102729860009984  Sep  7 08:00  @dhh              RT @ggreenwald: Democrat...
+ 244102741125890048  Sep  7 08:00  @eveningedition   LDN—Obama's nomination; ...
+ 244102834398851073  Sep  7 08:00  @JEG2             RT @tenderlove: If corpo...
+ 244103057175113729  Sep  7 08:01  @BarackObama      Donate $10 or more --> g...
+ 244104146997870594  Sep  7 08:05  @calebelston      We just announced Mosaic...
+ 244104558433951744  Sep  7 08:07  @al3x             RT @wcmaier: Better bank...
+ 244105599351148544  Sep  7 08:11  @FakeDorsey       “Write drunk. Edit sober...
+ 244106476048764928  Sep  7 08:14  @mbostock         If you are wondering how...
+ 244107236262170624  Sep  7 08:17  @fbjork           RT @jondot: Just publish...
+ 244107823733174272  Sep  7 08:20  @codeforamerica   RT @randomhacks: Going t...
+ 244107890632294400  Sep  7 08:20  @fivethirtyeight  The Weatherman is Not a ...
+ 244108728834592770  Sep  7 08:23  @calebelston      RT @olivercameron: Mosai...
+ 244109797308379136  Sep  7 08:28  @calebelston      Pushing the button to la...
+ 244110336414859264  Sep  7 08:30  @pat_shaughnessy  Something else to vote f...
+ 244111183165157376  Sep  7 08:33  @ironicsans       If you like good real-li...
+4611686018427387904  Sep  7 08:35  @mutgoff          Happy Birthday @imdane. ...
           eos
         end
       end
@@ -1912,25 +1944,19 @@ ID                  Posted at     Screen name       Text
     context "--number" do
       before do
         stub_get("/1.1/statuses/mentions_timeline.json").with(:query => {:count => "1"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1.1/statuses/mentions_timeline.json").with(:query => {:count => "200"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1.1/statuses/mentions_timeline.json").with(:query => {:count => "200", :max_id => "244099460672679937"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        (5..185).step(20).to_a.reverse.each do |count|
-          stub_get("/1.1/statuses/mentions_timeline.json").with(:query => {:count => count, :max_id => "244099460672679937"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        end
+        stub_get("/1.1/statuses/mentions_timeline.json").with(:query => {:count => "200"}).to_return(:body => fixture("200_statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/statuses/mentions_timeline.json").with(:query => {:count => "1", :max_id => "265500541700956160"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should limit the number of results to 1" do
+      it "limits the number of results to 1" do
         @cli.options = @cli.options.merge("number" => 1)
         @cli.mentions
         expect(a_get("/1.1/statuses/mentions_timeline.json").with(:query => {:count => "1"})).to have_been_made
       end
-      it "should limit the number of results to 345" do
-        @cli.options = @cli.options.merge("number" => 345)
+      it "limits the number of results to 201" do
+        @cli.options = @cli.options.merge("number" => 201)
         @cli.mentions
         expect(a_get("/1.1/statuses/mentions_timeline.json").with(:query => {:count => "200"})).to have_been_made
-        expect(a_get("/1.1/statuses/mentions_timeline.json").with(:query => {:count => "200", :max_id => "244099460672679937"})).to have_been_made.times(7)
-        (5..185).step(20).to_a.reverse.each do |count|
-          expect(a_get("/1.1/statuses/mentions_timeline.json").with(:query => {:count => count, :max_id => "244099460672679937"})).to have_been_made
-        end
+        expect(a_get("/1.1/statuses/mentions_timeline.json").with(:query => {:count => "1", :max_id => "265500541700956160"})).to have_been_made
       end
     end
   end
@@ -1939,7 +1965,7 @@ ID                  Posted at     Screen name       Text
     before do
       @cli.options = @cli.options.merge("display-url" => true)
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       expect do
         @cli.open("sferik")
       end.not_to raise_error
@@ -1949,7 +1975,7 @@ ID                  Posted at     Screen name       Text
         @cli.options = @cli.options.merge("id" => true)
         stub_get("/1.1/users/show.json").with(:query => {:user_id => "420"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.open("420")
         expect(a_get("/1.1/users/show.json").with(:query => {:user_id => "420"})).to have_been_made
       end
@@ -1959,11 +1985,11 @@ ID                  Posted at     Screen name       Text
         @cli.options = @cli.options.merge("status" => true)
         stub_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.open("55709764298092545")
         expect(a_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"})).to have_been_made
       end
-      it "should have the correct output" do
+      it "has the correct output" do
         expect do
           @cli.open("55709764298092545")
         end.not_to raise_error
@@ -1974,36 +2000,37 @@ ID                  Posted at     Screen name       Text
   describe "#reply" do
     before do
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc", "location" => true)
-      stub_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-      stub_post("/1.1/statuses/update.json").with(:body => {:in_reply_to_status_id => "55709764298092545", :status => "@sferik Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"}).to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1.1/statuses/show/263813522369159169.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status_with_mention.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/statuses/update.json").with(:body => {:in_reply_to_status_id => "263813522369159169", :status => "@joshfrench Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"}).to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       stub_request(:get, "http://checkip.dyndns.org/").to_return(:body => fixture("checkip.html"), :headers => {:content_type => "text/html"})
       stub_request(:get, "http://www.geoplugin.net/xml.gp?ip=50.131.22.169").to_return(:body => fixture("geoplugin.xml"), :headers => {:content_type => "application/xml"})
     end
-    it "should request the correct resource" do
-      @cli.reply("55709764298092545", "Testing")
-      expect(a_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"})).to have_been_made
-      expect(a_post("/1.1/statuses/update.json").with(:body => {:in_reply_to_status_id => "55709764298092545", :status => "@sferik Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"})).to have_been_made
+    it "requests the correct resource" do
+      @cli.reply("263813522369159169", "Testing")
+      expect(a_get("/1.1/statuses/show/263813522369159169.json").with(:query => {:include_my_retweet => "false"})).to have_been_made
+      expect(a_post("/1.1/statuses/update.json").with(:body => {:in_reply_to_status_id => "263813522369159169", :status => "@joshfrench Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"})).to have_been_made
       expect(a_request(:get, "http://checkip.dyndns.org/")).to have_been_made
       expect(a_request(:get, "http://www.geoplugin.net/xml.gp?ip=50.131.22.169")).to have_been_made
     end
-    it "should have the correct output" do
-      @cli.reply("55709764298092545", "Testing")
-      expect($stdout.string.split("\n").first).to eq "Reply posted by @testcli to @sferik."
+    it "has the correct output" do
+      @cli.reply("263813522369159169", "Testing")
+      expect($stdout.string.split("\n").first).to eq "Reply posted by @testcli to @joshfrench."
     end
     context "--all" do
       before do
         @cli.options = @cli.options.merge("all" => true)
+        stub_post("/1.1/statuses/update.json").with(:body => {:in_reply_to_status_id => "263813522369159169", :status => "@joshfrench @sferik Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"}).to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
-        @cli.reply("55709764298092545", "Testing")
-        expect(a_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"})).to have_been_made
-        expect(a_post("/1.1/statuses/update.json").with(:body => {:in_reply_to_status_id => "55709764298092545", :status => "@sferik Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"})).to have_been_made
+      it "requests the correct resource" do
+        @cli.reply("263813522369159169", "Testing")
+        expect(a_get("/1.1/statuses/show/263813522369159169.json").with(:query => {:include_my_retweet => "false"})).to have_been_made
+        expect(a_post("/1.1/statuses/update.json").with(:body => {:in_reply_to_status_id => "263813522369159169", :status => "@joshfrench @sferik Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"})).to have_been_made
         expect(a_request(:get, "http://checkip.dyndns.org/")).to have_been_made
         expect(a_request(:get, "http://www.geoplugin.net/xml.gp?ip=50.131.22.169")).to have_been_made
       end
-      it "should have the correct output" do
-        @cli.reply("55709764298092545", "Testing")
-        expect($stdout.string.split("\n").first).to eq "Reply posted by @testcli to @sferik."
+      it "has the correct output" do
+        @cli.reply("263813522369159169", "Testing")
+        expect($stdout.string.split("\n").first).to eq "Reply posted by @testcli to @joshfrench @sferik."
       end
     end
   end
@@ -2013,11 +2040,11 @@ ID                  Posted at     Screen name       Text
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc")
       stub_post("/1.1/report_spam.json").with(:body => {:screen_name => "sferik"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resource" do
+    it "requests the correct resource" do
       @cli.report_spam("sferik")
       expect(a_post("/1.1/report_spam.json").with(:body => {:screen_name => "sferik"})).to have_been_made
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.report_spam("sferik")
       expect($stdout.string).to match /^@testcli reported 1 user/
     end
@@ -2026,7 +2053,7 @@ ID                  Posted at     Screen name       Text
         @cli.options = @cli.options.merge("id" => true)
         stub_post("/1.1/report_spam.json").with(:body => {:user_id => "7505382"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.report_spam("7505382")
         expect(a_post("/1.1/report_spam.json").with(:body => {:user_id => "7505382"})).to have_been_made
       end
@@ -2038,11 +2065,11 @@ ID                  Posted at     Screen name       Text
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc")
       stub_post("/1.1/statuses/retweet/26755176471724032.json").to_return(:body => fixture("retweet.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resource" do
+    it "requests the correct resource" do
       @cli.retweet("26755176471724032")
       expect(a_post("/1.1/statuses/retweet/26755176471724032.json")).to have_been_made
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.retweet("26755176471724032")
       expect($stdout.string).to match /^@testcli retweeted 1 tweet.$/
     end
@@ -2054,12 +2081,12 @@ ID                  Posted at     Screen name       Text
       stub_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "200", :include_rts => "true", :max_id => "244102729860009983"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     context "without arguments" do
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.retweets
         expect(a_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "200", :include_rts => "true"})).to have_been_made
         expect(a_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "200", :include_rts => "true", :max_id => "244102729860009983"})).to have_been_made.times(3)
       end
-      it "should have the correct output" do
+      it "has the correct output" do
         @cli.retweets
         expect($stdout.string).to eq <<-eos
 \e[1m\e[33m   @calebelston\e[0m
@@ -2149,7 +2176,7 @@ ID                  Posted at     Screen name       Text
       before do
         @cli.options = @cli.options.merge("csv" => true)
       end
-      it "should output in CSV format" do
+      it "outputs in CSV format" do
         @cli.retweets
         expect($stdout.string).to eq <<-eos
 ID,Posted at,Screen name,Text
@@ -2180,7 +2207,7 @@ ID,Posted at,Screen name,Text
       before do
         @cli.options = @cli.options.merge("long" => true)
       end
-      it "should output in long format" do
+      it "outputs in long format" do
         @cli.retweets
         expect($stdout.string).to eq <<-eos
 ID                  Posted at     Screen name      Text
@@ -2210,7 +2237,7 @@ ID                  Posted at     Screen name      Text
         before do
           @cli.options = @cli.options.merge("reverse" => true)
         end
-        it "should reverse the order of the sort" do
+        it "reverses the order of the sort" do
           @cli.retweets
           expect($stdout.string).to eq <<-eos
 ID                  Posted at     Screen name      Text
@@ -2243,13 +2270,13 @@ ID                  Posted at     Screen name      Text
         stub_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "200", :include_rts => "true"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "200", :include_rts => "true", :max_id => "244107823733174271"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should limit the number of results to 1" do
+      it "limits the number of results to 1" do
         @cli.options = @cli.options.merge("number" => 1)
         @cli.retweets
         expect(a_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "200", :include_rts => "true"})).to have_been_made
       end
-      it "should limit the number of results to 345" do
-        @cli.options = @cli.options.merge("number" => 345)
+      it "limits the number of results to 201" do
+        @cli.options = @cli.options.merge("number" => 201)
         @cli.retweets
         expect(a_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "200", :include_rts => "true"})).to have_been_made
         expect(a_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "200", :include_rts => "true", :max_id => "244107823733174271"})).to have_been_made
@@ -2260,7 +2287,7 @@ ID                  Posted at     Screen name      Text
         stub_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "200", :include_rts => "true", :screen_name => "sferik"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         stub_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "200", :include_rts => "true", :screen_name => "sferik", :max_id => "244102729860009983"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.retweets("sferik")
         expect(a_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "200", :include_rts => "true", :screen_name => "sferik"})).to have_been_made
         expect(a_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "200", :include_rts => "true", :screen_name => "sferik", :max_id => "244102729860009983"})).to have_been_made.times(3)
@@ -2271,7 +2298,7 @@ ID                  Posted at     Screen name      Text
           stub_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "200", :include_rts => "true", :user_id => "7505382"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
           stub_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "200", :include_rts => "true", :user_id => "7505382", :max_id => "244102729860009983"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
-        it "should request the correct resource" do
+        it "requests the correct resource" do
           @cli.retweets("7505382")
           expect(a_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "200", :include_rts => "true", :user_id => "7505382"})).to have_been_made
           expect(a_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "200", :include_rts => "true", :user_id => "7505382", :max_id => "244102729860009983"})).to have_been_made.times(3)
@@ -2281,7 +2308,7 @@ ID                  Posted at     Screen name      Text
   end
 
   describe "#ruler" do
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.ruler
       expect($stdout.string.chomp.size).to eq 140
       expect($stdout.string.chomp).to eq "----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|"
@@ -2290,7 +2317,7 @@ ID                  Posted at     Screen name      Text
       before do
         @cli.options = @cli.options.merge("indent" => 2)
       end
-      it "should have the correct output" do
+      it "has the correct output" do
         @cli.ruler
         expect($stdout.string.chomp.size).to eq 142
         expect($stdout.string.chomp).to eq "  ----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|"
@@ -2303,12 +2330,12 @@ ID                  Posted at     Screen name      Text
       stub_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       stub_get("/i/statuses/55709764298092545/activity/summary.json").to_return(:body => fixture("activity_summary.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resources" do
+    it "requests the correct resources" do
       @cli.status("55709764298092545")
       expect(a_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"})).to have_been_made
       expect(a_get("/i/statuses/55709764298092545/activity/summary.json")).to have_been_made
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.status("55709764298092545")
       expect($stdout.string).to eq <<-eos
 ID           55709764298092545
@@ -2327,7 +2354,7 @@ URL          https://twitter.com/sferik/status/55709764298092545
       before do
         @cli.options = @cli.options.merge("csv" => true)
       end
-      it "should have the correct output" do
+      it "has the correct output" do
         @cli.status("55709764298092545")
         expect($stdout.string).to eq <<-eos
 ID,Text,Screen name,Posted at,Location,Retweets,Favorites,Replies,Source,URL
@@ -2339,7 +2366,7 @@ ID,Text,Screen name,Posted at,Location,Retweets,Favorites,Replies,Source,URL
       before do
         stub_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status_no_street_address.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should have the correct output" do
+      it "has the correct output" do
         @cli.status("55709764298092545")
         expect($stdout.string).to eq <<-eos
 ID           55709764298092550
@@ -2359,7 +2386,7 @@ URL          https://twitter.com/sferik/status/55709764298092550
       before do
         stub_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status_no_locality.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should have the correct output" do
+      it "has the correct output" do
         @cli.status("55709764298092545")
         expect($stdout.string).to eq <<-eos
 ID           55709764298092549
@@ -2379,7 +2406,7 @@ URL          https://twitter.com/sferik/status/55709764298092549
       before do
         stub_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status_no_attributes.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should have the correct output" do
+      it "has the correct output" do
         @cli.status("55709764298092545")
         expect($stdout.string).to eq <<-eos
 ID           55709764298092546
@@ -2399,7 +2426,7 @@ URL          https://twitter.com/sferik/status/55709764298092546
       before do
         stub_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status_no_country.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should have the correct output" do
+      it "has the correct output" do
         @cli.status("55709764298092545")
         expect($stdout.string).to eq <<-eos
 ID           55709764298092547
@@ -2419,7 +2446,7 @@ URL          https://twitter.com/sferik/status/55709764298092547
       before do
         stub_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status_no_full_name.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should have the correct output" do
+      it "has the correct output" do
         @cli.status("55709764298092545")
         expect($stdout.string).to eq <<-eos
 ID           55709764298092548
@@ -2435,6 +2462,69 @@ URL          https://twitter.com/sferik/status/55709764298092548
         eos
       end
     end
+    context "with no place" do
+      before do
+        stub_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status_no_place.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_request(:get, "http://maps.google.com/maps/geo").with(:query => hash_including({:key => "REPLACE_WITH_YOUR_GOOGLE_KEY", :oe => "utf-8", :output => "xml"})).to_return(:body => fixture("geo.kml"), :headers => {:content_type => "text/xml; charset=UTF-8"})
+      end
+      it "has the correct output" do
+        @cli.status("55709764298092545")
+        expect($stdout.string).to eq <<-eos
+ID           55709764298092551
+Text         The problem with your code is that it's doing exactly what you told it to do.
+Screen name  @sferik
+Posted at    Apr  6  2011 (8 months ago)
+Location     San Francisco, CA, USA
+Retweets     320
+Favorites    2
+Replies      1
+Source       Twitter for iPhone
+URL          https://twitter.com/sferik/status/55709764298092551
+        eos
+      end
+      context "with no city" do
+        before do
+          stub_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status_no_place.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+          stub_request(:get, "http://maps.google.com/maps/geo").with(:query => hash_including({:key => "REPLACE_WITH_YOUR_GOOGLE_KEY", :oe => "utf-8", :output => "xml"})).to_return(:body => fixture("geo_no_city.kml"), :headers => {:content_type => "text/xml; charset=UTF-8"})
+        end
+        it "has the correct output" do
+          @cli.status("55709764298092545")
+          expect($stdout.string).to eq <<-eos
+ID           55709764298092551
+Text         The problem with your code is that it's doing exactly what you told it to do.
+Screen name  @sferik
+Posted at    Apr  6  2011 (8 months ago)
+Location     CA, USA
+Retweets     320
+Favorites    2
+Replies      1
+Source       Twitter for iPhone
+URL          https://twitter.com/sferik/status/55709764298092551
+          eos
+        end
+      end
+      context "with no state" do
+        before do
+          stub_get("/1.1/statuses/show/55709764298092545.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status_no_place.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+          stub_request(:get, "http://maps.google.com/maps/geo").with(:query => hash_including({:key => "REPLACE_WITH_YOUR_GOOGLE_KEY", :oe => "utf-8", :output => "xml"})).to_return(:body => fixture("geo_no_state.kml"), :headers => {:content_type => "text/xml; charset=UTF-8"})
+        end
+        it "has the correct output" do
+          @cli.status("55709764298092545")
+          expect($stdout.string).to eq <<-eos
+ID           55709764298092551
+Text         The problem with your code is that it's doing exactly what you told it to do.
+Screen name  @sferik
+Posted at    Apr  6  2011 (8 months ago)
+Location     USA
+Retweets     320
+Favorites    2
+Replies      1
+Source       Twitter for iPhone
+URL          https://twitter.com/sferik/status/55709764298092551
+          eos
+        end
+      end
+    end
   end
 
   describe "#timeline" do
@@ -2442,11 +2532,11 @@ URL          https://twitter.com/sferik/status/55709764298092548
       stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "20"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     context "without user" do
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.timeline
         expect(a_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "20"})).to have_been_made
       end
-      it "should have the correct output" do
+      it "has the correct output" do
         @cli.timeline
         expect($stdout.string).to eq <<-eos
 \e[1m\e[33m   @mutgoff\e[0m
@@ -2531,11 +2621,11 @@ URL          https://twitter.com/sferik/status/55709764298092548
       before do
         @cli.options = @cli.options.merge("csv" => true)
       end
-      it "should output in CSV format" do
+      it "outputs in CSV format" do
         @cli.timeline
         expect($stdout.string).to eq <<-eos
 ID,Posted at,Screen name,Text
-244111636544225280,2012-09-07 16:35:24 +0000,mutgoff,Happy Birthday @imdane. Watch out for those @rally pranksters!
+4611686018427387904,2012-09-07 16:35:24 +0000,mutgoff,Happy Birthday @imdane. Watch out for those @rally pranksters!
 244111183165157376,2012-09-07 16:33:36 +0000,ironicsans,"If you like good real-life stories, check out @NarrativelyNY's just-launched site http://t.co/wiUL07jE (and also visit http://t.co/ZoyQxqWA)"
 244110336414859264,2012-09-07 16:30:14 +0000,pat_shaughnessy,"Something else to vote for: ""New Rails workshops to bring more women into the Boston software scene"" http://t.co/eNBuckHc /cc @bostonrb"
 244109797308379136,2012-09-07 16:28:05 +0000,calebelston,Pushing the button to launch the site. http://t.co/qLoEn5jG
@@ -2558,64 +2648,84 @@ ID,Posted at,Screen name,Text
         eos
       end
     end
+    context "--exclude=replies" do
+      before do
+        @cli.options = @cli.options.merge("exclude" => "replies")
+        stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "20", :exclude_replies => "true"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "excludes replies" do
+        @cli.timeline
+        expect(a_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "20", :exclude_replies => "true"})).to have_been_made
+      end
+    end
+    context "--exclude=retweets" do
+      before do
+        @cli.options = @cli.options.merge("exclude" => "retweets")
+        stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "20", :include_rts => "false"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "excludes retweets" do
+        @cli.timeline
+        expect(a_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "20", :include_rts => "false"})).to have_been_made
+      end
+    end
     context "--long" do
       before do
         @cli.options = @cli.options.merge("long" => true)
       end
-      it "should output in long format" do
+      it "outputs in long format" do
         @cli.timeline
         expect($stdout.string).to eq <<-eos
-ID                  Posted at     Screen name       Text
-244111636544225280  Sep  7 08:35  @mutgoff          Happy Birthday @imdane. W...
-244111183165157376  Sep  7 08:33  @ironicsans       If you like good real-lif...
-244110336414859264  Sep  7 08:30  @pat_shaughnessy  Something else to vote fo...
-244109797308379136  Sep  7 08:28  @calebelston      Pushing the button to lau...
-244108728834592770  Sep  7 08:23  @calebelston      RT @olivercameron: Mosaic...
-244107890632294400  Sep  7 08:20  @fivethirtyeight  The Weatherman is Not a M...
-244107823733174272  Sep  7 08:20  @codeforamerica   RT @randomhacks: Going to...
-244107236262170624  Sep  7 08:17  @fbjork           RT @jondot: Just publishe...
-244106476048764928  Sep  7 08:14  @mbostock         If you are wondering how ...
-244105599351148544  Sep  7 08:11  @FakeDorsey       “Write drunk. Edit sober....
-244104558433951744  Sep  7 08:07  @al3x             RT @wcmaier: Better banki...
-244104146997870594  Sep  7 08:05  @calebelston      We just announced Mosaic,...
-244103057175113729  Sep  7 08:01  @BarackObama      Donate $10 or more --> ge...
-244102834398851073  Sep  7 08:00  @JEG2             RT @tenderlove: If corpor...
-244102741125890048  Sep  7 08:00  @eveningedition   LDN—Obama's nomination; P...
-244102729860009984  Sep  7 08:00  @dhh              RT @ggreenwald: Democrats...
-244102490646278146  Sep  7 07:59  @jasonfried       The story of Mars Curiosi...
-244102209942458368  Sep  7 07:57  @sferik           @episod @twitterapi now h...
-244100411563339777  Sep  7 07:50  @sferik           @episod @twitterapi Did y...
-244099460672679938  Sep  7 07:47  @dwiskus          Gentlemen, you can't figh...
+ID                   Posted at     Screen name       Text
+4611686018427387904  Sep  7 08:35  @mutgoff          Happy Birthday @imdane. ...
+ 244111183165157376  Sep  7 08:33  @ironicsans       If you like good real-li...
+ 244110336414859264  Sep  7 08:30  @pat_shaughnessy  Something else to vote f...
+ 244109797308379136  Sep  7 08:28  @calebelston      Pushing the button to la...
+ 244108728834592770  Sep  7 08:23  @calebelston      RT @olivercameron: Mosai...
+ 244107890632294400  Sep  7 08:20  @fivethirtyeight  The Weatherman is Not a ...
+ 244107823733174272  Sep  7 08:20  @codeforamerica   RT @randomhacks: Going t...
+ 244107236262170624  Sep  7 08:17  @fbjork           RT @jondot: Just publish...
+ 244106476048764928  Sep  7 08:14  @mbostock         If you are wondering how...
+ 244105599351148544  Sep  7 08:11  @FakeDorsey       “Write drunk. Edit sober...
+ 244104558433951744  Sep  7 08:07  @al3x             RT @wcmaier: Better bank...
+ 244104146997870594  Sep  7 08:05  @calebelston      We just announced Mosaic...
+ 244103057175113729  Sep  7 08:01  @BarackObama      Donate $10 or more --> g...
+ 244102834398851073  Sep  7 08:00  @JEG2             RT @tenderlove: If corpo...
+ 244102741125890048  Sep  7 08:00  @eveningedition   LDN—Obama's nomination; ...
+ 244102729860009984  Sep  7 08:00  @dhh              RT @ggreenwald: Democrat...
+ 244102490646278146  Sep  7 07:59  @jasonfried       The story of Mars Curios...
+ 244102209942458368  Sep  7 07:57  @sferik           @episod @twitterapi now ...
+ 244100411563339777  Sep  7 07:50  @sferik           @episod @twitterapi Did ...
+ 244099460672679938  Sep  7 07:47  @dwiskus          Gentlemen, you can't fig...
         eos
       end
       context "--reverse" do
         before do
           @cli.options = @cli.options.merge("reverse" => true)
         end
-        it "should reverse the order of the sort" do
+        it "reverses the order of the sort" do
           @cli.timeline
           expect($stdout.string).to eq <<-eos
-ID                  Posted at     Screen name       Text
-244099460672679938  Sep  7 07:47  @dwiskus          Gentlemen, you can't figh...
-244100411563339777  Sep  7 07:50  @sferik           @episod @twitterapi Did y...
-244102209942458368  Sep  7 07:57  @sferik           @episod @twitterapi now h...
-244102490646278146  Sep  7 07:59  @jasonfried       The story of Mars Curiosi...
-244102729860009984  Sep  7 08:00  @dhh              RT @ggreenwald: Democrats...
-244102741125890048  Sep  7 08:00  @eveningedition   LDN—Obama's nomination; P...
-244102834398851073  Sep  7 08:00  @JEG2             RT @tenderlove: If corpor...
-244103057175113729  Sep  7 08:01  @BarackObama      Donate $10 or more --> ge...
-244104146997870594  Sep  7 08:05  @calebelston      We just announced Mosaic,...
-244104558433951744  Sep  7 08:07  @al3x             RT @wcmaier: Better banki...
-244105599351148544  Sep  7 08:11  @FakeDorsey       “Write drunk. Edit sober....
-244106476048764928  Sep  7 08:14  @mbostock         If you are wondering how ...
-244107236262170624  Sep  7 08:17  @fbjork           RT @jondot: Just publishe...
-244107823733174272  Sep  7 08:20  @codeforamerica   RT @randomhacks: Going to...
-244107890632294400  Sep  7 08:20  @fivethirtyeight  The Weatherman is Not a M...
-244108728834592770  Sep  7 08:23  @calebelston      RT @olivercameron: Mosaic...
-244109797308379136  Sep  7 08:28  @calebelston      Pushing the button to lau...
-244110336414859264  Sep  7 08:30  @pat_shaughnessy  Something else to vote fo...
-244111183165157376  Sep  7 08:33  @ironicsans       If you like good real-lif...
-244111636544225280  Sep  7 08:35  @mutgoff          Happy Birthday @imdane. W...
+ID                   Posted at     Screen name       Text
+ 244099460672679938  Sep  7 07:47  @dwiskus          Gentlemen, you can't fig...
+ 244100411563339777  Sep  7 07:50  @sferik           @episod @twitterapi Did ...
+ 244102209942458368  Sep  7 07:57  @sferik           @episod @twitterapi now ...
+ 244102490646278146  Sep  7 07:59  @jasonfried       The story of Mars Curios...
+ 244102729860009984  Sep  7 08:00  @dhh              RT @ggreenwald: Democrat...
+ 244102741125890048  Sep  7 08:00  @eveningedition   LDN—Obama's nomination; ...
+ 244102834398851073  Sep  7 08:00  @JEG2             RT @tenderlove: If corpo...
+ 244103057175113729  Sep  7 08:01  @BarackObama      Donate $10 or more --> g...
+ 244104146997870594  Sep  7 08:05  @calebelston      We just announced Mosaic...
+ 244104558433951744  Sep  7 08:07  @al3x             RT @wcmaier: Better bank...
+ 244105599351148544  Sep  7 08:11  @FakeDorsey       “Write drunk. Edit sober...
+ 244106476048764928  Sep  7 08:14  @mbostock         If you are wondering how...
+ 244107236262170624  Sep  7 08:17  @fbjork           RT @jondot: Just publish...
+ 244107823733174272  Sep  7 08:20  @codeforamerica   RT @randomhacks: Going t...
+ 244107890632294400  Sep  7 08:20  @fivethirtyeight  The Weatherman is Not a ...
+ 244108728834592770  Sep  7 08:23  @calebelston      RT @olivercameron: Mosai...
+ 244109797308379136  Sep  7 08:28  @calebelston      Pushing the button to la...
+ 244110336414859264  Sep  7 08:30  @pat_shaughnessy  Something else to vote f...
+ 244111183165157376  Sep  7 08:33  @ironicsans       If you like good real-li...
+4611686018427387904  Sep  7 08:35  @mutgoff          Happy Birthday @imdane. ...
           eos
         end
       end
@@ -2623,32 +2733,26 @@ ID                  Posted at     Screen name       Text
     context "--number" do
       before do
         stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "1"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "200"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "200", :max_id => "244099460672679937"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        (5..185).step(20).to_a.reverse.each do |count|
-          stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => count, :max_id => "244099460672679937"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-        end
+        stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "200"}).to_return(:body => fixture("200_statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+        stub_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "1", :max_id => "265500541700956160"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should limit the number of results to 1" do
+      it "limits the number of results to 1" do
         @cli.options = @cli.options.merge("number" => 1)
         @cli.timeline
         expect(a_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "1"})).to have_been_made
       end
-      it "should limit the number of results to 345" do
-        @cli.options = @cli.options.merge("number" => 345)
+      it "limits the number of results to 201" do
+        @cli.options = @cli.options.merge("number" => 201)
         @cli.timeline
         expect(a_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "200"})).to have_been_made
-        expect(a_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "200", :max_id => "244099460672679937"})).to have_been_made.times(7)
-        (5..185).step(20).to_a.reverse.each do |count|
-          expect(a_get("/1.1/statuses/home_timeline.json").with(:query => {:count => count, :max_id => "244099460672679937"})).to have_been_made
-        end
+        expect(a_get("/1.1/statuses/home_timeline.json").with(:query => {:count => "1", :max_id => "265500541700956160"})).to have_been_made
       end
     end
     context "with a user passed" do
       before do
         stub_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "20", :screen_name => "sferik"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.timeline("sferik")
         expect(a_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "20", :screen_name => "sferik"})).to have_been_made
       end
@@ -2657,7 +2761,7 @@ ID                  Posted at     Screen name       Text
           @cli.options = @cli.options.merge("id" => true)
           stub_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "20", :user_id => "7505382"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
-        it "should request the correct resource" do
+        it "requests the correct resource" do
           @cli.timeline("7505382")
           expect(a_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "20", :user_id => "7505382"})).to have_been_made
         end
@@ -2665,25 +2769,19 @@ ID                  Posted at     Screen name       Text
       context "--number" do
         before do
           stub_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "1", :screen_name => "sferik"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-          stub_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "200", :screen_name => "sferik"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-          stub_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "200", :screen_name => "sferik", :max_id => "244099460672679937"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-          (5..185).step(20).to_a.reverse.each do |count|
-            stub_get("/1.1/statuses/user_timeline.json").with(:query => {:count => count, :screen_name => "sferik", :max_id => "244099460672679937"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-          end
+          stub_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "200", :screen_name => "sferik"}).to_return(:body => fixture("200_statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+          stub_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "1", :screen_name => "sferik", :max_id => "265500541700956160"}).to_return(:body => fixture("statuses.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
-        it "should limit the number of results to 1" do
+        it "limits the number of results to 1" do
           @cli.options = @cli.options.merge("number" => 1)
           @cli.timeline("sferik")
           expect(a_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "1", :screen_name => "sferik"})).to have_been_made
         end
-        it "should limit the number of results to 345" do
-          @cli.options = @cli.options.merge("number" => 345)
+        it "limits the number of results to 201" do
+          @cli.options = @cli.options.merge("number" => 201)
           @cli.timeline("sferik")
           expect(a_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "200", :screen_name => "sferik"})).to have_been_made
-          expect(a_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "200", :screen_name => "sferik", :max_id => "244099460672679937"})).to have_been_made.times(7)
-          (5..185).step(20).to_a.reverse.each do |count|
-            expect(a_get("/1.1/statuses/user_timeline.json").with(:query => {:count => count, :screen_name => "sferik", :max_id => "244099460672679937"})).to have_been_made
-          end
+          expect(a_get("/1.1/statuses/user_timeline.json").with(:query => {:count => "1", :screen_name => "sferik", :max_id => "265500541700956160"})).to have_been_made
         end
       end
     end
@@ -2693,11 +2791,11 @@ ID                  Posted at     Screen name       Text
     before do
       stub_get("/1.1/trends/place.json").with(:query => {:id => "1"}).to_return(:body => fixture("trends.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resource" do
+    it "requests the correct resource" do
       @cli.trends
       expect(a_get("/1.1/trends/place.json").with(:query => {:id => "1"})).to have_been_made
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.trends
       expect($stdout.string.chomp).to eq "#sevenwordsaftersex  Walkman              Allen Iverson"
     end
@@ -2706,11 +2804,11 @@ ID                  Posted at     Screen name       Text
         @cli.options = @cli.options.merge("exclude-hashtags" => true)
         stub_get("/1.1/trends/place.json").with(:query => {:id => "1", :exclude => "hashtags"}).to_return(:body => fixture("trends.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.trends
         expect(a_get("/1.1/trends/place.json").with(:query => {:id => "1", :exclude => "hashtags"})).to have_been_made
       end
-      it "should have the correct output" do
+      it "has the correct output" do
         @cli.trends
         expect($stdout.string.chomp).to eq "#sevenwordsaftersex  Walkman              Allen Iverson"
       end
@@ -2719,11 +2817,11 @@ ID                  Posted at     Screen name       Text
       before do
         stub_get("/1.1/trends/place.json").with(:query => {:id => "2487956"}).to_return(:body => fixture("trends.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.trends("2487956")
         expect(a_get("/1.1/trends/place.json").with(:query => {:id => "2487956"})).to have_been_made
       end
-      it "should have the correct output" do
+      it "has the correct output" do
         @cli.trends("2487956")
         expect($stdout.string.chomp).to eq "#sevenwordsaftersex  Walkman              Allen Iverson"
       end
@@ -2734,11 +2832,11 @@ ID                  Posted at     Screen name       Text
     before do
       stub_get("/1.1/trends/available.json").to_return(:body => fixture("locations.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resource" do
+    it "requests the correct resource" do
       @cli.trend_locations
       expect(a_get("/1.1/trends/available.json")).to have_been_made
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.trend_locations
       expect($stdout.string.chomp).to eq "Boston         New York       San Francisco  United States  Worldwide"
     end
@@ -2746,7 +2844,7 @@ ID                  Posted at     Screen name       Text
       before do
         @cli.options = @cli.options.merge("csv" => true)
       end
-      it "should output in CSV format" do
+      it "outputs in CSV format" do
         @cli.trend_locations
         expect($stdout.string.chomp).to eq <<-eos.chomp
 WOEID,Parent ID,Type,Name,Country
@@ -2762,7 +2860,7 @@ WOEID,Parent ID,Type,Name,Country
       before do
         @cli.options = @cli.options.merge("long" => true)
       end
-      it "should output in long format" do
+      it "outputs in long format" do
         @cli.trend_locations
         expect($stdout.string.chomp).to eq <<-eos.chomp
 WOEID     Parent ID  Type       Name           Country
@@ -2778,7 +2876,7 @@ WOEID     Parent ID  Type       Name           Country
       before do
         @cli.options = @cli.options.merge("reverse" => true)
       end
-      it "should reverse the order of the sort" do
+      it "reverses the order of the sort" do
         @cli.trend_locations
         expect($stdout.string.chomp).to eq "Worldwide      United States  San Francisco  New York       Boston"
       end
@@ -2787,7 +2885,7 @@ WOEID     Parent ID  Type       Name           Country
       before do
         @cli.options = @cli.options.merge("sort" => "country")
       end
-      it "should sort by number of favorites" do
+      it "sorts by number of favorites" do
         @cli.trend_locations
         expect($stdout.string.chomp).to eq "Worldwide      New York       Boston         United States  San Francisco"
       end
@@ -2796,7 +2894,7 @@ WOEID     Parent ID  Type       Name           Country
       before do
         @cli.options = @cli.options.merge("sort" => "parent")
       end
-      it "should sort by number of favorites" do
+      it "sorts by number of favorites" do
         @cli.trend_locations
         expect($stdout.string.chomp).to eq "Boston         Worldwide      New York       United States  San Francisco"
       end
@@ -2805,7 +2903,7 @@ WOEID     Parent ID  Type       Name           Country
       before do
         @cli.options = @cli.options.merge("sort" => "type")
       end
-      it "should sort by number of favorites" do
+      it "sorts by number of favorites" do
         @cli.trend_locations
         expect($stdout.string.chomp).to eq "United States  Worldwide      New York       Boston         San Francisco"
       end
@@ -2814,7 +2912,7 @@ WOEID     Parent ID  Type       Name           Country
       before do
         @cli.options = @cli.options.merge("sort" => "woeid")
       end
-      it "should sort by number of favorites" do
+      it "sorts by number of favorites" do
         @cli.trend_locations
         expect($stdout.string.chomp).to eq "Worldwide      Boston         New York       San Francisco  United States"
       end
@@ -2823,7 +2921,7 @@ WOEID     Parent ID  Type       Name           Country
       before do
         @cli.options = @cli.options.merge("unsorted" => true)
       end
-      it "should not be sorted" do
+      it "is not sorted" do
         @cli.trend_locations
         expect($stdout.string.chomp).to eq "Boston         Worldwide      New York       United States  San Francisco"
       end
@@ -2835,12 +2933,12 @@ WOEID     Parent ID  Type       Name           Country
       @cli.options = @cli.options.merge("profile" => fixture_path + "/.trc")
     end
     context "one user" do
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         stub_post("/1.1/friendships/destroy.json").with(:body => {:screen_name => "sferik"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         @cli.unfollow("sferik")
         expect(a_post("/1.1/friendships/destroy.json").with(:body => {:screen_name => "sferik"})).to have_been_made
       end
-      it "should have the correct output" do
+      it "has the correct output" do
         stub_post("/1.1/friendships/destroy.json").with(:body => {:screen_name => "sferik"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         @cli.unfollow("sferik")
         expect($stdout.string).to match /^@testcli is no longer following 1 user\.$/
@@ -2850,13 +2948,13 @@ WOEID     Parent ID  Type       Name           Country
           @cli.options = @cli.options.merge("id" => true)
           stub_post("/1.1/friendships/destroy.json").with(:body => {:user_id => "7505382"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
         end
-        it "should request the correct resource" do
+        it "requests the correct resource" do
           @cli.unfollow("7505382")
           expect(a_post("/1.1/friendships/destroy.json").with(:body => {:user_id => "7505382"})).to have_been_made
         end
       end
       context "Twitter is down" do
-        it "should retry 3 times and then raise an error" do
+        it "retries 3 times and then raise an error" do
           stub_post("/1.1/friendships/destroy.json").with(:body => {:screen_name => "sferik"}).to_return(:status => 502)
           expect do
             @cli.unfollow("sferik")
@@ -2874,13 +2972,13 @@ WOEID     Parent ID  Type       Name           Country
       stub_request(:get, "http://checkip.dyndns.org/").to_return(:body => fixture("checkip.html"), :headers => {:content_type => "text/html"})
       stub_request(:get, "http://www.geoplugin.net/xml.gp?ip=50.131.22.169").to_return(:body => fixture("geoplugin.xml"), :headers => {:content_type => "application/xml"})
     end
-    it "should request the correct resource" do
+    it "requests the correct resource" do
       @cli.update("Testing")
       expect(a_post("/1.1/statuses/update.json").with(:body => {:status => "Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"})).to have_been_made
       expect(a_request(:get, "http://checkip.dyndns.org/")).to have_been_made
       expect(a_request(:get, "http://www.geoplugin.net/xml.gp?ip=50.131.22.169")).to have_been_made
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.update("Testing")
       expect($stdout.string.split("\n").first).to eq "Tweet posted by @testcli."
     end
@@ -2889,11 +2987,11 @@ WOEID     Parent ID  Type       Name           Country
         @cli.options = @cli.options.merge("file" => fixture_path + "/long.png")
         stub_post("/1.1/statuses/update_with_media.json").to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.update("Testing")
         expect(a_post("/1.1/statuses/update_with_media.json")).to have_been_made
       end
-      it "should have the correct output" do
+      it "has the correct output" do
         @cli.update("Testing")
         expect($stdout.string.split("\n").first).to eq "Tweet posted by @testcli."
       end
@@ -2904,11 +3002,11 @@ WOEID     Parent ID  Type       Name           Country
     before do
       stub_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik,pengwynn"}).to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resource" do
+    it "requests the correct resource" do
       @cli.users("sferik", "pengwynn")
       expect(a_post("/1.1/users/lookup.json").with(:body => {:screen_name => "sferik,pengwynn"})).to have_been_made
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.users("sferik", "pengwynn")
       expect($stdout.string.chomp).to eq "pengwynn  sferik"
     end
@@ -2916,7 +3014,7 @@ WOEID     Parent ID  Type       Name           Country
       before do
         @cli.options = @cli.options.merge("csv" => true)
       end
-      it "should output in CSV format" do
+      it "outputs in CSV format" do
         @cli.users("sferik", "pengwynn")
         expect($stdout.string).to eq <<-eos
 ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name
@@ -2929,7 +3027,7 @@ ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name
       before do
         @cli.options = @cli.options.merge("long" => true)
       end
-      it "should output in long format" do
+      it "outputs in long format" do
         @cli.users("sferik", "pengwynn")
         expect($stdout.string).to eq <<-eos
 ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
@@ -2942,7 +3040,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("reverse" => true)
       end
-      it "should reverse the order of the sort" do
+      it "reverses the order of the sort" do
         @cli.users("sferik", "pengwynn")
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -2951,7 +3049,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "favorites")
       end
-      it "should sort by number of favorites" do
+      it "sorts by number of favorites" do
         @cli.users("sferik", "pengwynn")
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -2960,7 +3058,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "followers")
       end
-      it "should sort by number of followers" do
+      it "sorts by number of followers" do
         @cli.users("sferik", "pengwynn")
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -2969,7 +3067,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "friends")
       end
-      it "should sort by number of friends" do
+      it "sorts by number of friends" do
         @cli.users("sferik", "pengwynn")
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -2979,7 +3077,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.options = @cli.options.merge("id" => true)
         stub_post("/1.1/users/lookup.json").with(:body => {:user_id => "7505382,14100886"}).to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.users("7505382", "14100886")
         expect(a_post("/1.1/users/lookup.json").with(:body => {:user_id => "7505382,14100886"})).to have_been_made
       end
@@ -2988,7 +3086,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "listed")
       end
-      it "should sort by number of list memberships" do
+      it "sorts by number of list memberships" do
         @cli.users("sferik", "pengwynn")
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -2997,7 +3095,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "since")
       end
-      it "should sort by the time when Twitter acount was created" do
+      it "sorts by the time when Twitter acount was created" do
         @cli.users("sferik", "pengwynn")
         expect($stdout.string.chomp).to eq "sferik    pengwynn"
       end
@@ -3006,7 +3104,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "tweets")
       end
-      it "should sort by number of Tweets" do
+      it "sorts by number of Tweets" do
         @cli.users("sferik", "pengwynn")
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -3015,7 +3113,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("sort" => "tweeted")
       end
-      it "should sort by the time of the last Tweet" do
+      it "sorts by the time of the last Tweet" do
         @cli.users("sferik", "pengwynn")
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -3024,7 +3122,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       before do
         @cli.options = @cli.options.merge("unsorted" => true)
       end
-      it "should not be sorted" do
+      it "is not sorted" do
         @cli.users("sferik", "pengwynn")
         expect($stdout.string.chomp).to eq "pengwynn  sferik"
       end
@@ -3032,7 +3130,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
   end
 
   describe "#version" do
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.version
       expect($stdout.string.chomp).to eq T::Version.to_s
     end
@@ -3042,11 +3140,11 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     before do
       stub_get("/1.1/users/show.json").with(:query => {:screen_name => "sferik"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    it "should request the correct resource" do
+    it "requests the correct resource" do
       @cli.whois("sferik")
       expect(a_get("/1.1/users/show.json").with(:query => {:screen_name => "sferik"})).to have_been_made
     end
-    it "should have the correct output" do
+    it "has the correct output" do
       @cli.whois("sferik")
       expect($stdout.string).to eq <<-eos
 ID           7505382
@@ -3068,7 +3166,7 @@ URL          https://github.com/sferik
       before do
         @cli.options = @cli.options.merge("csv" => true)
       end
-      it "should have the correct output" do
+      it "has the correct output" do
         @cli.whois("sferik")
         expect($stdout.string).to eq <<-eos
 ID,Verified,Name,Screen name,Bio,Location,Following,Last update,Lasted updated at,Since,Tweets,Favorites,Listed,Following,Followers,URL
@@ -3081,7 +3179,7 @@ ID,Verified,Name,Screen name,Bio,Location,Following,Last update,Lasted updated a
         @cli.options = @cli.options.merge("id" => true)
         stub_get("/1.1/users/show.json").with(:query => {:user_id => "7505382"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
-      it "should request the correct resource" do
+      it "requests the correct resource" do
         @cli.whois("7505382")
         expect(a_get("/1.1/users/show.json").with(:query => {:user_id => "7505382"})).to have_been_made
       end