diff --git a/tests/src/com/unciv/logic/civilization/CapitalConnectionsFinderTests.kt b/tests/src/com/unciv/logic/civilization/CapitalConnectionsFinderTests.kt
index b8c21923d3..9dc7924047 100644
--- a/tests/src/com/unciv/logic/civilization/CapitalConnectionsFinderTests.kt
+++ b/tests/src/com/unciv/logic/civilization/CapitalConnectionsFinderTests.kt
@@ -1,3 +1,5 @@
+@file:Suppress("UNUSED_VARIABLE")  // These are tests and the names serve readability
+
 package com.unciv.logic.civilization
 
 import com.unciv.logic.map.tile.RoadStatus
diff --git a/tests/src/com/unciv/logic/civilization/CityMovingTests.kt b/tests/src/com/unciv/logic/civilization/CityMovingTests.kt
index 56ae25a3ed..0be0119edb 100644
--- a/tests/src/com/unciv/logic/civilization/CityMovingTests.kt
+++ b/tests/src/com/unciv/logic/civilization/CityMovingTests.kt
@@ -1,3 +1,5 @@
+@file:Suppress("UNUSED_VARIABLE")  // These are tests and the names serve readability
+
 package com.unciv.logic.civilization
 
 import com.unciv.logic.map.tile.RoadStatus
diff --git a/tests/src/com/unciv/logic/civilization/FreeBuildingTests.kt b/tests/src/com/unciv/logic/civilization/FreeBuildingTests.kt
index fb675e0b1d..b93eeb1828 100644
--- a/tests/src/com/unciv/logic/civilization/FreeBuildingTests.kt
+++ b/tests/src/com/unciv/logic/civilization/FreeBuildingTests.kt
@@ -1,3 +1,5 @@
+@file:Suppress("UNUSED_VARIABLE")  // These are tests and the names serve readability
+
 package com.unciv.logic.civilization
 
 import com.badlogic.gdx.math.Vector2
diff --git a/tests/src/com/unciv/logic/map/UnitFomationTests.kt b/tests/src/com/unciv/logic/map/UnitFomationTests.kt
index 220c71e325..45323301b2 100644
--- a/tests/src/com/unciv/logic/map/UnitFomationTests.kt
+++ b/tests/src/com/unciv/logic/map/UnitFomationTests.kt
@@ -1,3 +1,5 @@
+@file:Suppress("UNUSED_VARIABLE")  // These are tests and the names serve readability
+
 package com.unciv.logic.map
 
 import com.badlogic.gdx.math.Vector2
@@ -22,15 +24,15 @@ internal class UnitFormationTests {
 
     val testGame = TestGame()
     fun setUp(size: Int, baseTerrain: String = Constants.desert) {
-        testGame.makeHexagonalMap(size)
+        testGame.makeHexagonalMap(size, baseTerrain)
         civInfo = testGame.addCiv()
     }
-    
+
     @After
     fun wrapUp() {
         DebugUtils.VISIBLE_MAP = false
     }
-    
+
     @Test
     fun `basic formation functionality civilian`() {
         setUp(1)
@@ -71,7 +73,7 @@ internal class UnitFormationTests {
     fun `basic formation not available functionality`() {
         setUp(1)
         val centerTile = testGame.getTile(Vector2(0f,0f))
-        val civilianUnit = testGame.addUnit("Worker", civInfo, centerTile) 
+        val civilianUnit = testGame.addUnit("Worker", civInfo, centerTile)
         assertFalse(civilianUnit.getOtherEscortUnit() != null)
         assertFalse(civilianUnit.isEscorting())
         civilianUnit.startEscorting()
diff --git a/tests/src/com/unciv/logic/map/UnitMovementTests.kt b/tests/src/com/unciv/logic/map/UnitMovementTests.kt
index 1186ce9624..2831e76aa9 100644
--- a/tests/src/com/unciv/logic/map/UnitMovementTests.kt
+++ b/tests/src/com/unciv/logic/map/UnitMovementTests.kt
@@ -1,4 +1,6 @@
-//  Taken from https://github.com/TomGrill/gdx-testing
+@file:Suppress("UNUSED_VARIABLE")  // These are tests and the names serve readability
+
+//  Taken from https://github.com/TomGrill/gdx-testing
 package com.unciv.logic.map
 
 import com.badlogic.gdx.math.Vector2
diff --git a/tests/src/com/unciv/logic/map/UpgradeTests.kt b/tests/src/com/unciv/logic/map/UpgradeTests.kt
index 55e5aefdf1..9145587003 100644
--- a/tests/src/com/unciv/logic/map/UpgradeTests.kt
+++ b/tests/src/com/unciv/logic/map/UpgradeTests.kt
@@ -1,3 +1,5 @@
+@file:Suppress("UNUSED_VARIABLE")  // These are tests and the names serve readability
+
 package com.unciv.logic.map
 
 import com.badlogic.gdx.math.Vector2
@@ -36,7 +38,7 @@ class UpgradeTests {
 
         Assert.assertTrue("Unit should upgrade to special unit, not warrior", unit1.baseUnit == unitToUpgradeTo)
     }
-    
+
     @Test
     fun ruinsUpgradeToNormalUnitWithoutUnique() {
         val unitToUpgradeTo = testGame.createBaseUnit()
@@ -102,7 +104,7 @@ class UpgradeTests {
 
         val civ = testGame.addCiv()
         testGame.addCity(civ, testGame.getTile(Vector2.Zero)) // We need to own the tile to be able to upgrade here
-        
+
         val unit1 = testGame.addUnit(testUnit.name, civ, testGame.getTile(Vector2.Zero))
         var upgradeActions = UnitActionsUpgrade.getUpgradeActionAnywhere(unit1)