         @server.beginBattles (err, battleIds) =>
           if err then throw err
           battleIds.length.should.equal(2)
-          spy = @sandbox.spy(@user1, 'message')
+          spy = @sandbox.spy(@user1, 'announce')
           commands.executeCommand @server, @user1, @room, "battles", @user2.name, =>
             spy.callCount.should.equal(1)
-            spy.firstCall.args[0].should.include(@user2.name)
-            spy.firstCall.args[0].should.include(battleIds[0])
-            spy.firstCall.args[0].should.not.include(@user1.name)
-            spy.firstCall.args[0].should.not.include(battleIds[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) ->

          done()

      it "messages all rooms and all battles", (done) ->
        mock = @sandbox.mock(@room).expects('message').once()
        spy1 = @sandbox.spy(@user1, 'send')
        spy2 = @sandbox.spy(@user2, 'send')
        @server.queuePlayer(@user1.id, generateTeam()).should.be.empty

        @server.queuePlayer(@user2.id, [ Factory("Magikarp") ], "Im an Alt")
        @server.beginBattles (err, battleIds) =>
          if err then throw err
          spy = @sandbox.spy(@user1, 'announce')
          commands.executeCommand @server, @user1, @room, "battles", @user2.name, =>
            if err then throw err
            spy.callCount.should.equal(1)
            spy.firstCall.args[1].should.include(@user2.name)
            done()

    describe "topic", ->
