diff --git a/squirrelbattle/tests/entities_test.py b/squirrelbattle/tests/entities_test.py
index 371bfc7..efd3397 100644
--- a/squirrelbattle/tests/entities_test.py
+++ b/squirrelbattle/tests/entities_test.py
@@ -97,12 +97,13 @@ class TestEntities(unittest.TestCase):
         self.assertFalse(item.held)
         item.hold(self.player)
         self.assertTrue(item.held)
-        item.drop(2, 6)
-        self.assertEqual(item.y, 2)
+        item.drop()
+        self.assertEqual(item.y, 1)
         self.assertEqual(item.x, 6)
 
         # Pick up item
-        self.player.move_down()
+        self.player.move_left()
+        self.player.move_right()
         self.assertTrue(item.held)
         self.assertEqual(item.held_by, self.player)
         self.assertIn(item, self.player.inventory)
@@ -125,10 +126,14 @@ class TestEntities(unittest.TestCase):
         item.act(self.map)
         self.assertFalse(hedgehog.dead)
         self.assertFalse(teddy_bear.dead)
-        item.drop(42, 42)
+        self.player.move(42, 42)
+        item.hold(self.player)
+        item.use()
         self.assertEqual(item.y, 42)
         self.assertEqual(item.x, 42)
-        item.act(self.map)
+        # Wait for the explosion
+        for ignored in range(5):
+            item.act(self.map)
         self.assertTrue(hedgehog.dead)
         self.assertTrue(teddy_bear.dead)
         bomb_state = item.save_state()
diff --git a/squirrelbattle/tests/game_test.py b/squirrelbattle/tests/game_test.py
index 42886e5..fd3ec3e 100644
--- a/squirrelbattle/tests/game_test.py
+++ b/squirrelbattle/tests/game_test.py
@@ -261,12 +261,8 @@ class TestGame(unittest.TestCase):
         self.assertEqual(self.game.settings.KEY_LEFT_PRIMARY, 'a')
 
         # Navigate to "texture pack"
-        self.game.handle_key_pressed(KeyValues.DOWN)
-        self.game.handle_key_pressed(KeyValues.DOWN)
-        self.game.handle_key_pressed(KeyValues.DOWN)
-        self.game.handle_key_pressed(KeyValues.DOWN)
-        self.game.handle_key_pressed(KeyValues.DOWN)
-        self.game.handle_key_pressed(KeyValues.DOWN)
+        for ignored in range(9):
+            self.game.handle_key_pressed(KeyValues.DOWN)
 
         # Change texture pack
         self.assertEqual(self.game.settings.TEXTURE_PACK, "ascii")