       opts = {poll}
 
       it 'returns a result it already applies to', (done) -> @create {x:5}, =>
-        @collection.query @client, {'x':5}, opts, (err, emitter) =>
+        @collection.query {'x':5}, opts, (err, emitter) =>
           expected = [docName:@docName, data:{x:5}, type:otTypes.json0.uri, v:1, c:@cName]
           assert.deepEqual emitter.data, expected
           emitter.destroy()
           done()
 
       it 'gets an empty result set when you query something with no results', (done) ->
-        @collection.query @client, {'xyz':123}, opts, (err, emitter) ->
+        @collection.query {'xyz':123}, opts, (err, emitter) ->
           assert.deepEqual emitter.data, []
           emitter.on 'diff', -> throw new Error 'should not have added results'
 

            throw new Error err if err

      it 'does not emit receive events to a destroyed query', (done) ->
        @collection.query @client, {'x':5}, opts, (err, emitter) =>
          emitter.on 'diff', -> throw new Error 'add called after destroy'

          emitter.destroy()


      #console.log util.inspect diff, colors:yes, depth:null
      it 'remove an element that no longer matches', (done) -> @create {x:5}, =>
        @collection.query {'x':5}, opts, (err, emitter) =>
          emitter.on 'diff', (diff) =>
            assert.deepEqual diff, [type:'remove', index:0, howMany:1]

