 
       it 'handles null or empty data', ->
         callback = sinon.spy()
-        @giphy.getRandomResult undefined, callback
-        @giphy.getRandomResult null, callback
-        @giphy.getRandomResult [], callback
+        @giphy.getRandomResultData undefined, callback
+        @giphy.getRandomResultData null, callback
+        @giphy.getRandomResultData [], callback
         callback.should.not.have.been.called
 
-    describe '.getUriFromResult', ->
-      it 'returns .images.original.url', ->
-        uri = @giphy.getUriFromResult sampleData
+    describe '.getUriFromResultData', ->
+      it 'returns .data.images.original.url', ->
+        uri = @giphy.getUriFromResultData sampleData
         should.exist uri
         uri.should.be.eql sampleData.images.original.url
 
       it 'does not return a uri for invalid input', ->
-        uri = @giphy.getUriFromResult null
+        uri = @giphy.getUriFromResultData null
         should.not.exist uri
-        uri = @giphy.getUriFromResult { }
+        uri = @giphy.getUriFromResultData { }
         should.not.exist uri
-        uri = @giphy.getUriFromResult { images: { } }
+        uri = @giphy.getUriFromResultData { images: { } }
         should.not.exist uri
-        uri = @giphy.getUriFromResult { images: { original: { } } }
+        uri = @giphy.getUriFromResultData { images: { original: { } } }
         should.not.exist uri
 
     describe '.getSearchUri', ->
-      it 'searches using args', ->
+      it 'gets a result using args', ->
         state = { args: 'testing' }
         @fakes.stub @giphy.api, 'search'
         @giphy.getSearchUri state
         @giphy.api.search.should.have.been.called.once
         @giphy.api.search.should.have.been.calledWith { q: 'testing' }, sinon.match.func
 
-      it 'searches using args and options', ->
-        state = { args: 'testing', options: { limit: 10 } }
+      it 'gets a result using args and options', ->
+        state = { args: 'testing', options: { limit: '10' } }
         @fakes.stub @giphy.api, 'search'
         @giphy.getSearchUri state
         @giphy.api.search.should.have.been.called.once
-        @giphy.api.search.should.have.been.calledWith { q: 'testing', limit: 10 }, sinon.match.func
+        @giphy.api.search.should.have.been.calledWith { q: 'testing', limit: '10' }, sinon.match.func
 
       it 'handles the response callback', ->
         state = { msg: 'msg', args: 'testing' }
         @fakes.stub @giphy.api, 'search', (options, callback) -> callback 'error', sampleCollectionResult
         @fakes.stub @giphy, 'handleResponse', (state, err, uriCreator) -> uriCreator()
-        @fakes.stub @giphy, 'getRandomResult'
+        @fakes.stub @giphy, 'getRandomResultData'
         @giphy.getSearchUri state
         @giphy.handleResponse.should.have.been.called.once
         @giphy.handleResponse.should.have.been.calledWith state, 'error', sinon.match.func
-        @giphy.getRandomResult.should.have.been.called.once
-        @giphy.getRandomResult.should.have.been.calledWith sampleCollectionResult.data, @giphy.getUriFromResult
+        @giphy.getRandomResultData.should.have.been.called.once
+        @giphy.getRandomResultData.should.have.been.calledWith sampleCollectionResult.data, @giphy.getUriFromResultData
 
       it 'calls getRandomUri for empty args', ->
         @fakes.stub @giphy, 'getRandomUri'
-        @giphy.getSearchUri {}
+        @giphy.getSearchUri { }
         @giphy.getSearchUri { args: null }
         @giphy.getSearchUri { args: '' }
         @giphy.getRandomUri.should.have.callCount 3

        @giphy.getNextOption.should.be.called.twice
        @giphy.getNextOption.should.be.calledWith state
        should.exist state.options
        state.options.should.eql {}

      it 'parses mixed switches and args', ->
        state = { args: '/test1:1 test 2 /test3:test3' }

        @giphy.error.should.have.been.called.twice

      it 'handles null giphy command args', ->
        @giphy.respond { }
        @giphy.respond { match: null }
        @giphy.respond { match: [] }
        @giphy.respond { match: [ null ] }
