diff --git a/squirrelbattle/game.py b/squirrelbattle/game.py
index 8da50a0..779e98f 100644
--- a/squirrelbattle/game.py
+++ b/squirrelbattle/game.py
@@ -155,7 +155,7 @@ class Game:
             # Wait for the direction of the friendly entity
             self.waiting_for_friendly_key = True
         elif key == KeyValues.WAIT:
-            self.map.tick()
+            self.map.tick(self.player)
         elif key == KeyValues.LADDER:
             self.handle_ladder()
 
diff --git a/squirrelbattle/tests/game_test.py b/squirrelbattle/tests/game_test.py
index 0e8bf9e..efc20da 100644
--- a/squirrelbattle/tests/game_test.py
+++ b/squirrelbattle/tests/game_test.py
@@ -46,11 +46,6 @@ class TestGame(unittest.TestCase):
         bomb.hold(self.game.player)
         sword.hold(self.game.player)
 
-        for entity in self.game.map.entities:
-            # trumpets change order when they are loaded, this breaks the test.
-            if entity.name == 'trumpet':
-                self.game.map.remove_entity(entity)
-
         # Ensure that merchants can be saved
         merchant = Merchant()
         merchant.move(3, 6)