diff --git a/Assets/Scripts/Logic/Data/GameTeam.cs b/Assets/Scripts/Logic/Data/GameTeam.cs
index 1cba59222bfcd916834ae518a042d3d081359d4c..9cc9214ed179ac762e34c615ca995085da99caf2 100644
--- a/Assets/Scripts/Logic/Data/GameTeam.cs
+++ b/Assets/Scripts/Logic/Data/GameTeam.cs
@@ -55,7 +55,7 @@ public class GameTeam {
 		Overview = overview;
 		TeamColor = color;
 		Castle = castle;
-		Barracks = new List<Barrack>(barracks).OrderBy(barrack => barrack.Ordinal).ToList();
+		Barracks = barracks.OrderBy(barrack => barrack.Ordinal).ToList();
 		Money = overview.EconomyConfig.StartingBalance;
 	}
 
diff --git a/Assets/Scripts/Logic/Data/World/WorldGenerator.cs b/Assets/Scripts/Logic/Data/World/WorldGenerator.cs
index a35ba34c654a769f336a0f58d6295df5308af729..7e65c8f5ba4a3d3a9fc3fd0626969740e93810a1 100644
--- a/Assets/Scripts/Logic/Data/World/WorldGenerator.cs
+++ b/Assets/Scripts/Logic/Data/World/WorldGenerator.cs
@@ -79,17 +79,17 @@ internal class WorldGenerator {
 		}
 
 		if (i == 0) {
-			List<int> goodindeces = new List<int>();
+			List<int> goodIndices = new List<int>();
 			for (int j = 0; j < _width; j++) {
 				tp = new TilePosition(_height / 2, _width);
 				if (!occupiedList.Where(building => !(building is Obstacle))
 					.Any(occupied => occupied.Position.FirstNormDistance(tp) < 4)) {
-					goodindeces.Add(j);
+					goodIndices.Add(j);
 				}
 			}
 
 			occupiedList.Add(_constructors.CreateObstacle(new TilePosition(
-				goodindeces[_random.Next() % goodindeces.Count],
+				goodIndices[_random.Next() % goodIndices.Count],
 				_height / 2)));
 		}
 
diff --git a/Assets/Scripts/LogicTests/GameOverviewTest.cs b/Assets/Scripts/LogicTests/GameOverviewTest.cs
index c32e7b5ae5b4861674dd492ef37cee98c767ba27..44b07a610c1715dd15a4b7581c2447014a987776 100644
--- a/Assets/Scripts/LogicTests/GameOverviewTest.cs
+++ b/Assets/Scripts/LogicTests/GameOverviewTest.cs
@@ -43,7 +43,6 @@ public class GameOverviewTest {
 	}
 
 	[Test]
-	[Repeat(100)]
 	public void TestFightingPhaseHasLimitedTime() {
 		GameOverview overview = GameTestUtils.CreateOverview();