diff --git a/game-app/game-core/src/test/java/games/strategy/triplea/delegate/battle/steps/BattleStepsTest.java b/game-app/game-core/src/test/java/games/strategy/triplea/delegate/battle/steps/BattleStepsTest.java
index 2d9b02dd5e8..01f83471b18 100644
--- a/game-app/game-core/src/test/java/games/strategy/triplea/delegate/battle/steps/BattleStepsTest.java
+++ b/game-app/game-core/src/test/java/games/strategy/triplea/delegate/battle/steps/BattleStepsTest.java
@@ -79,8 +79,8 @@ public static Territory givenSeaBattleSite() {
 
   @Value
   public static class UnitAndAttachment {
-    private Unit unit;
-    private UnitAttachment unitAttachment;
+    Unit unit;
+    UnitAttachment unitAttachment;
   }
 
   public static UnitAndAttachment newUnitAndAttachment() {
@@ -767,6 +767,7 @@ void defendingFirstStrikeSubmergeBeforeBattleIfSubmersibleSubsAndRetreatBeforeBa
             givenBattleStateBuilder()
                 .gameData(
                     givenGameData()
+                        .withCaptureUnitsOnEnteringTerritory(false)
                         .withSubRetreatBeforeBattle(true)
                         .withSubmersibleSubs(true)
                         .withDefendingSuicideAndMunitionUnitsDoNotFire(false)
@@ -1051,6 +1052,7 @@ void defendingFirstStrikeWithWW2v2() {
             givenBattleStateBuilder()
                 .gameData(
                     givenGameData()
+                        .withCaptureUnitsOnEnteringTerritory(false)
                         .withSubRetreatBeforeBattle(false)
                         .withDefendingSuicideAndMunitionUnitsDoNotFire(false)
                         .withAlliedAirIndependent(true)
@@ -1085,6 +1087,7 @@ void defendingFirstStrikeWithWW2v2AndDestroyers() {
             givenBattleStateBuilder()
                 .gameData(
                     givenGameData()
+                        .withCaptureUnitsOnEnteringTerritory(false)
                         .withSubRetreatBeforeBattle(false)
                         .withDefendingSuicideAndMunitionUnitsDoNotFire(false)
                         .withAlliedAirIndependent(true)
@@ -1582,6 +1585,7 @@ void attackingFirstStrikeCanSubmergeIfSubmersibleSubs() {
             givenBattleStateBuilder()
                 .gameData(
                     givenGameData()
+                        .withCaptureUnitsOnEnteringTerritory(false)
                         .withSubRetreatBeforeBattle(false)
                         .withDefendingSuicideAndMunitionUnitsDoNotFire(false)
                         .withAlliedAirIndependent(true)
@@ -1654,6 +1658,7 @@ void defendingFirstStrikeCanSubmergeIfSubmersibleSubsAndDestroyers() {
             givenBattleStateBuilder()
                 .gameData(
                     givenGameData()
+                        .withCaptureUnitsOnEnteringTerritory(false)
                         .withSubRetreatBeforeBattle(false)
                         .withDefendingSuicideAndMunitionUnitsDoNotFire(false)
                         .withAlliedAirIndependent(true)
@@ -1975,6 +1980,7 @@ void partialAmphibiousAttackCanWithdrawIfHasNonAmphibious() {
             givenBattleStateBuilder()
                 .gameData(
                     givenGameData()
+                        .withCaptureUnitsOnEnteringTerritory(false)
                         .withSubRetreatBeforeBattle(false)
                         .withDefendingSuicideAndMunitionUnitsDoNotFire(false)
                         .withAlliedAirIndependent(true)
@@ -2066,6 +2072,7 @@ void attackingPlanesCanWithdrawWW2v2AndAmphibious() {
             givenBattleStateBuilder()
                 .gameData(
                     givenGameData()
+                        .withCaptureUnitsOnEnteringTerritory(false)
                         .withDefendingSuicideAndMunitionUnitsDoNotFire(false)
                         .withSubRetreatBeforeBattle(false)
                         .withAlliedAirIndependent(true)
@@ -2100,6 +2107,7 @@ void attackingPlanesCanWithdrawPartialAmphibiousAndAmphibious() {
             givenBattleStateBuilder()
                 .gameData(
                     givenGameData()
+                        .withCaptureUnitsOnEnteringTerritory(false)
                         .withSubRetreatBeforeBattle(false)
                         .withWW2V2(false)
                         .withAttackerRetreatPlanes(false)
@@ -2131,6 +2139,7 @@ void attackingPlanesCanWithdrawPlanesRetreatAndAmphibious() {
             givenBattleStateBuilder()
                 .gameData(
                     givenGameData()
+                        .withCaptureUnitsOnEnteringTerritory(false)
                         .withSubRetreatBeforeBattle(false)
                         .withWW2V2(false)
                         .withDefendingSuicideAndMunitionUnitsDoNotFire(false)
@@ -2162,6 +2171,7 @@ void attackingPlanesCanNotWithdrawWW2v2AndNotAmphibious() {
             givenBattleStateBuilder()
                 .gameData(
                     givenGameData()
+                        .withCaptureUnitsOnEnteringTerritory(false)
                         .withDefendingSuicideAndMunitionUnitsDoNotFire(false)
                         .withSubRetreatBeforeBattle(false)
                         .withAlliedAirIndependent(true)