           ratings.setRating(@user2.id, user2Rating, done)
 
       it "returns the user's rating to the user without arguments", (done) ->
-        spy = @sandbox.spy(@user1, 'message')
+        spy = @sandbox.spy(@user1, 'announce')
         commands.executeCommand @server, @user1, @room, "rating", =>
           spy.callCount.should.equal(1)
-          spy.firstCall.args[0].should.include(@user1.name)
-          spy.firstCall.args[0].should.include(user1Rating)
+          spy.firstCall.args[1].should.include(@user1.name)
+          spy.firstCall.args[1].should.include(user1Rating)
           done()
 
       it "returns someone's rating to the user as an argument", (done) ->
-        spy = @sandbox.spy(@user1, 'message')
+        spy = @sandbox.spy(@user1, 'announce')
         commands.executeCommand @server, @user1, @room, "rating", @user2.id, =>
           spy.callCount.should.equal(1)
           spy.callCount.should.equal(1)
-          spy.firstCall.args[0].should.include(@user2.name)
-          spy.firstCall.args[0].should.include(user2Rating)
+          spy.firstCall.args[1].should.include(@user2.name)
+          spy.firstCall.args[1].should.include(user2Rating)
           done()
 
     describe "kick", ->


      it "returns a list of alts and the main account", (done) ->
        @user1.authority = auth.levels.MOD
        spy = @sandbox.spy(@user1, 'message')
        commands.executeCommand @server, @user1, @room, "whois", @user1.name, =>
          spy.callCount.should.equal(1)
          spy.firstCall.args[0].should.include(@user1.name)
          spy.firstCall.args[0].should.include("alt1")
          spy.firstCall.args[0].should.include("alt2")
          done()

    describe "help", ->
      it "messages all available commands to that user", (done) ->
        spy = @sandbox.spy(@user1, 'message')
        mock = @sandbox.mock(@user2).expects('message').never()
        commandNames = (name  for name of commands.HelpDescriptions)
        commands.executeCommand @server, @user1, @room, "help", ->
          spy.callCount.should.equal(1)
          for commandName in commandNames
            spy.firstCall.args[0].should.include(commandName)
          mock.verify()
          done()

        @server.beginBattles (err, battleIds) =>
          if err then throw err
          battleIds.length.should.equal(2)
          spy = @sandbox.spy(@user1, 'announce')
          commands.executeCommand @server, @user1, @room, "battles", @user2.name, =>
            spy.callCount.should.equal(1)
            spy.firstCall.args[1].should.include(@user2.name)
            spy.firstCall.args[1].should.include(battleIds[0])
            spy.firstCall.args[1].should.not.include(@user1.name)
            spy.firstCall.args[1].should.not.include(battleIds[1])
            done()

      it "does not include alts in the battle list", (done) ->
