Refile for merging repos

459 files changed, 0 insertions, 132143 deletions

diff --git a/tests/v1-normal-match/Round 001/JsonMap.json b/tests/v1-normal-match/Round 001/JsonMap.json
deleted file mode 100644
index 2cf435d..0000000
--- a/tests/v1-normal-match/Round 001/JsonMap.json
+++ /dev/null
@@ -1,706 +0,0 @@
-{
-  "currentRound":1,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1
-    },
-    "speed":5,
-    "state":"READY",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":4,
-      "x":1
-    },
-    "speed":5
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":2
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":3
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":4
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":5
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":6
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":7
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":8
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":9
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":10
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":11
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":12
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":13
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":14
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":15
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":16
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":17
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":18
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":19
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":20
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":21
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":2
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":3
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":4
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":5
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":6
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":7
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":8
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":9
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":10
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":11
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":12
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":13
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":14
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":15
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":16
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":17
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":18
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":19
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":20
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":21
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":2
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":3
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":4
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":5
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":6
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":7
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":8
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":9
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":10
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":11
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":12
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":13
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":14
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":15
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":16
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":17
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":18
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":19
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":20
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":21
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":4,
-          "x":2
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":3
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":4
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":5
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":6
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":7
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":8
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":9
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":10
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":11
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":12
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":13
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":14
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":15
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":16
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":17
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":18
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":19
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":20
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":21
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 001/OpponentCommand.txt b/tests/v1-normal-match/Round 001/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 001/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 001/PlayerCommand.txt b/tests/v1-normal-match/Round 001/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 001/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 002/JsonMap.json b/tests/v1-normal-match/Round 002/JsonMap.json
deleted file mode 100644
index 2315b12..0000000
--- a/tests/v1-normal-match/Round 002/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":2,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":7
-    },
-    "speed":6,
-    "state":"ACCELERATING",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":4,
-      "x":7
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":2
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":3
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":4
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":5
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":6
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":7
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":8
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":9
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":10
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":11
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":12
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":13
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":14
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":15
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":16
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":17
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":18
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":19
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":20
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":21
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":22
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":23
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":24
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":25
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":26
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":27
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":2
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":3
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":4
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":5
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":6
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":7
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":8
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":9
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":10
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":11
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":12
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":13
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":14
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":15
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":16
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":17
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":18
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":19
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":20
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":21
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":22
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":23
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":24
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":25
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":26
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":27
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":2
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":3
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":4
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":5
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":6
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":7
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":8
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":9
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":10
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":11
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":12
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":13
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":14
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":15
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":16
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":17
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":18
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":19
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":20
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":21
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":22
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":23
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":24
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":25
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":26
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":27
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":2
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":3
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":4
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":5
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":6
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":7
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":4,
-          "x":8
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":9
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":10
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":11
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":12
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":13
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":14
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":15
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":16
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":17
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":18
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":19
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":20
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":21
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":22
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":23
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":24
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":25
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":26
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":27
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 002/OpponentCommand.txt b/tests/v1-normal-match/Round 002/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 002/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 002/PlayerCommand.txt b/tests/v1-normal-match/Round 002/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 002/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 003/JsonMap.json b/tests/v1-normal-match/Round 003/JsonMap.json
deleted file mode 100644
index d764c85..0000000
--- a/tests/v1-normal-match/Round 003/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":3,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":15
-    },
-    "speed":3,
-    "state":"HIT_MUD",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":4,
-      "x":15
-    },
-    "speed":3
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":10
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":11
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":12
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":13
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":14
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":15
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":16
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":17
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":18
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":19
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":20
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":21
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":22
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":23
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":24
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":25
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":26
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":27
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":28
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":29
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":30
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":31
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":32
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":33
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":34
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":35
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":10
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":11
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":12
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":13
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":14
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":15
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":16
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":17
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":18
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":19
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":20
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":21
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":22
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":23
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":24
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":25
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":26
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":27
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":28
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":29
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":30
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":31
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":32
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":33
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":34
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":35
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":10
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":11
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":12
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":13
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":14
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":15
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":16
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":17
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":18
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":19
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":20
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":21
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":22
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":23
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":24
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":25
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":26
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":27
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":28
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":29
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":30
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":31
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":32
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":33
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":34
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":35
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":10
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":11
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":12
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":13
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":14
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":15
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":4,
-          "x":16
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":17
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":18
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":19
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":20
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":21
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":22
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":23
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":24
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":25
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":26
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":27
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":28
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":29
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":30
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":31
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":32
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":33
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":34
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":35
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 003/OpponentCommand.txt b/tests/v1-normal-match/Round 003/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 003/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 003/PlayerCommand.txt b/tests/v1-normal-match/Round 003/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 003/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 004/JsonMap.json b/tests/v1-normal-match/Round 004/JsonMap.json
deleted file mode 100644
index 5f30eae..0000000
--- a/tests/v1-normal-match/Round 004/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":4,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":21
-    },
-    "speed":3,
-    "state":"HIT_MUD",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":4,
-      "x":21
-    },
-    "speed":3
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":16
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":17
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":18
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":19
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":20
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":21
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":22
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":23
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":24
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":25
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":26
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":27
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":28
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":29
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":30
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":31
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":32
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":33
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":34
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":35
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":36
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":37
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":38
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":39
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":40
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":41
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":16
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":17
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":18
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":19
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":20
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":21
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":22
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":23
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":24
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":25
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":26
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":27
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":28
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":29
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":30
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":31
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":32
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":33
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":34
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":35
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":36
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":37
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":38
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":39
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":40
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":41
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":16
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":17
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":18
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":19
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":20
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":21
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":22
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":23
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":24
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":25
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":26
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":27
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":28
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":29
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":30
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":31
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":32
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":33
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":34
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":35
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":36
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":37
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":38
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":39
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":40
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":41
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":16
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":17
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":18
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":19
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":20
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":21
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":4,
-          "x":22
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":23
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":24
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":25
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":26
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":27
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":28
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":29
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":30
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":31
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":32
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":33
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":34
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":35
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":36
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":37
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":38
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":39
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":40
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":41
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 004/OpponentCommand.txt b/tests/v1-normal-match/Round 004/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 004/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 004/PlayerCommand.txt b/tests/v1-normal-match/Round 004/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 004/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 005/JsonMap.json b/tests/v1-normal-match/Round 005/JsonMap.json
deleted file mode 100644
index 437ead0..0000000
--- a/tests/v1-normal-match/Round 005/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":5,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":27
-    },
-    "speed":6,
-    "state":"ACCELERATING",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":4,
-      "x":27
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":22
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":23
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":24
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":25
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":26
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":27
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":28
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":29
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":30
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":31
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":32
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":33
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":34
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":35
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":36
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":37
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":38
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":39
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":40
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":41
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":42
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":43
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":44
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":45
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":46
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":47
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":22
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":23
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":24
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":25
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":26
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":27
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":28
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":29
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":30
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":31
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":32
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":33
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":34
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":35
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":36
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":37
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":38
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":39
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":40
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":41
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":42
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":43
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":44
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":45
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":46
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":47
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":22
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":23
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":24
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":25
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":26
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":27
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":28
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":29
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":30
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":31
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":32
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":33
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":34
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":35
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":36
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":37
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":38
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":39
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":40
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":41
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":42
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":43
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":44
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":45
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":46
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":47
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":22
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":23
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":24
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":25
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":26
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":27
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":4,
-          "x":28
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":29
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":30
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":31
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":32
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":33
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":34
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":35
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":36
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":37
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":38
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":39
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":40
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":41
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":42
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":43
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":44
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":45
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":46
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":47
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 005/OpponentCommand.txt b/tests/v1-normal-match/Round 005/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 005/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 005/PlayerCommand.txt b/tests/v1-normal-match/Round 005/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 005/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 006/JsonMap.json b/tests/v1-normal-match/Round 006/JsonMap.json
deleted file mode 100644
index 083da96..0000000
--- a/tests/v1-normal-match/Round 006/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":6,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":35
-    },
-    "speed":3,
-    "state":"HIT_MUD",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":4,
-      "x":35
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":30
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":31
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":32
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":33
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":34
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":35
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":36
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":37
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":38
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":39
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":40
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":41
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":42
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":43
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":44
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":45
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":46
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":47
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":48
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":49
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":50
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":51
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":52
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":53
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":54
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":55
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":30
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":31
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":32
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":33
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":34
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":35
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":36
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":37
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":38
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":39
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":40
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":41
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":42
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":43
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":44
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":45
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":46
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":47
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":48
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":49
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":50
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":51
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":52
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":53
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":54
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":55
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":30
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":31
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":32
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":33
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":34
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":35
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":36
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":37
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":38
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":39
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":40
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":41
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":42
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":43
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":44
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":45
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":46
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":47
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":48
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":49
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":50
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":51
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":52
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":53
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":54
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":55
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":30
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":31
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":32
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":33
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":34
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":35
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":4,
-          "x":36
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":37
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":38
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":39
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":40
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":41
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":42
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":43
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":44
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":45
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":46
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":47
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":48
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":49
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":50
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":51
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":52
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":53
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":54
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":55
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 006/OpponentCommand.txt b/tests/v1-normal-match/Round 006/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 006/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 006/PlayerCommand.txt b/tests/v1-normal-match/Round 006/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 006/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 007/JsonMap.json b/tests/v1-normal-match/Round 007/JsonMap.json
deleted file mode 100644
index 278e6ba..0000000
--- a/tests/v1-normal-match/Round 007/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":7,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":41
-    },
-    "speed":3,
-    "state":"HIT_MUD",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":4,
-      "x":44
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":36
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":37
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":38
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":39
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":40
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":41
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":42
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":43
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":44
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":45
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":46
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":47
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":48
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":49
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":50
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":51
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":52
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":53
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":54
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":55
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":56
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":57
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":58
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":59
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":60
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":61
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":36
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":37
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":38
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":39
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":40
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":41
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":42
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":43
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":44
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":45
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":46
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":47
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":48
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":49
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":50
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":51
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":52
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":53
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":54
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":55
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":56
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":57
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":58
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":59
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":60
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":61
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":36
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":37
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":38
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":39
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":40
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":41
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":42
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":43
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":44
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":45
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":46
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":47
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":48
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":49
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":50
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":51
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":52
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":53
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":54
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":55
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":56
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":57
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":58
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":59
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":60
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":61
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":36
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":37
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":38
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":39
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":40
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":41
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":42
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":43
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":44
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":4,
-          "x":45
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":46
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":47
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":48
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":49
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":50
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":51
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":52
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":53
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":54
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":55
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":56
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":57
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":58
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":59
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":60
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":61
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 007/OpponentCommand.txt b/tests/v1-normal-match/Round 007/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 007/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 007/PlayerCommand.txt b/tests/v1-normal-match/Round 007/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 007/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 008/JsonMap.json b/tests/v1-normal-match/Round 008/JsonMap.json
deleted file mode 100644
index 5c7f9da..0000000
--- a/tests/v1-normal-match/Round 008/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":8,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":47
-    },
-    "speed":3,
-    "state":"HIT_MUD",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":4,
-      "x":53
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":42
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":43
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":44
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":45
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":46
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":47
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":48
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":49
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":50
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":51
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":52
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":53
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":54
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":55
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":56
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":57
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":58
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":59
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":60
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":61
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":62
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":63
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":64
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":65
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":66
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":67
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":42
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":43
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":44
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":45
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":46
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":47
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":48
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":49
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":50
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":51
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":52
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":53
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":54
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":55
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":56
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":57
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":58
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":59
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":60
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":61
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":62
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":63
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":64
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":65
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":66
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":67
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":42
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":43
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":44
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":45
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":46
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":47
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":48
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":49
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":50
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":51
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":52
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":53
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":54
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":55
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":56
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":57
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":58
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":59
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":60
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":61
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":62
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":63
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":64
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":65
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":66
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":67
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":42
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":43
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":44
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":45
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":46
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":47
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":48
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":49
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":50
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":51
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":52
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":53
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":4,
-          "x":54
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":55
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":56
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":57
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":58
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":59
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":60
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":61
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":62
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":63
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":64
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":65
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":66
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":67
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 008/OpponentCommand.txt b/tests/v1-normal-match/Round 008/OpponentCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 008/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 008/PlayerCommand.txt b/tests/v1-normal-match/Round 008/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 008/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 009/JsonMap.json b/tests/v1-normal-match/Round 009/JsonMap.json
deleted file mode 100644
index dcb7ce2..0000000
--- a/tests/v1-normal-match/Round 009/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":9,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":53
-    },
-    "speed":6,
-    "state":"ACCELERATING",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":58
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":48
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":49
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":50
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":51
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":52
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":53
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":54
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":55
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":56
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":57
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":58
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":59
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":60
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":61
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":62
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":63
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":64
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":65
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":66
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":67
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":68
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":69
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":70
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":71
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":72
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":73
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":48
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":49
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":50
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":51
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":52
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":53
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":54
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":55
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":56
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":57
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":58
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":59
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":60
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":61
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":62
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":63
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":64
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":65
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":66
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":67
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":68
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":69
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":70
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":71
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":72
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":73
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":48
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":49
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":50
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":51
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":52
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":53
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":54
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":55
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":56
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":57
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":58
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":3,
-          "x":59
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":60
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":61
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":62
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":63
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":64
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":65
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":66
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":67
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":68
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":69
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":70
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":71
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":72
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":73
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":48
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":49
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":50
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":51
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":52
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":53
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":54
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":55
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":56
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":57
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":58
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":59
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":60
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":61
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":62
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":63
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":64
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":65
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":66
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":67
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":68
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":69
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":70
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":71
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":72
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":73
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 009/OpponentCommand.txt b/tests/v1-normal-match/Round 009/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 009/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 009/PlayerCommand.txt b/tests/v1-normal-match/Round 009/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 009/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 010/JsonMap.json b/tests/v1-normal-match/Round 010/JsonMap.json
deleted file mode 100644
index ce83a02..0000000
--- a/tests/v1-normal-match/Round 010/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":10,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":61
-    },
-    "speed":3,
-    "state":"HIT_MUD",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":66
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":56
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":57
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":58
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":59
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":60
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":61
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":62
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":63
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":64
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":65
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":66
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":67
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":68
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":69
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":70
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":71
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":72
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":73
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":74
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":75
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":76
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":77
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":78
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":79
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":80
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":81
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":56
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":57
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":58
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":59
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":60
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":61
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":62
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":63
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":64
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":65
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":66
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":67
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":68
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":69
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":70
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":71
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":72
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":73
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":74
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":75
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":76
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":77
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":78
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":79
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":80
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":81
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":56
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":57
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":58
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":59
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":60
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":61
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":62
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":63
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":64
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":65
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":66
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":3,
-          "x":67
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":68
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":69
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":70
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":71
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":72
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":73
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":74
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":75
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":76
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":77
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":78
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":79
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":80
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":81
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":56
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":57
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":58
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":59
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":60
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":61
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":62
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":63
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":64
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":65
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":66
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":67
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":68
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":69
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":70
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":71
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":72
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":73
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":74
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":75
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":76
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":77
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":78
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":79
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":80
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":81
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 010/OpponentCommand.txt b/tests/v1-normal-match/Round 010/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 010/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 010/PlayerCommand.txt b/tests/v1-normal-match/Round 010/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 010/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 011/JsonMap.json b/tests/v1-normal-match/Round 011/JsonMap.json
deleted file mode 100644
index f18bf80..0000000
--- a/tests/v1-normal-match/Round 011/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":11,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":67
-    },
-    "speed":3,
-    "state":"HIT_MUD",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":81
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":62
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":63
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":64
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":65
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":66
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":67
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":68
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":69
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":70
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":71
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":72
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":73
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":74
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":75
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":76
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":77
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":78
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":79
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":80
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":81
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":82
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":83
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":84
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":85
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":86
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":87
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":62
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":63
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":64
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":65
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":66
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":67
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":68
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":69
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":70
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":71
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":72
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":73
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":74
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":75
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":76
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":77
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":78
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":79
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":80
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":81
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":82
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":83
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":84
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":85
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":86
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":87
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":62
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":63
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":64
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":65
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":66
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":67
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":68
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":69
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":70
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":71
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":72
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":73
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":74
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":75
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":76
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":77
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":78
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":79
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":80
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":81
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":3,
-          "x":82
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":83
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":84
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":85
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":86
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":87
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":62
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":63
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":64
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":65
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":66
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":67
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":68
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":69
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":70
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":71
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":72
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":73
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":74
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":75
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":76
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":77
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":78
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":79
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":80
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":81
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":82
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":83
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":84
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":85
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":86
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":87
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 011/OpponentCommand.txt b/tests/v1-normal-match/Round 011/OpponentCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 011/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 011/PlayerCommand.txt b/tests/v1-normal-match/Round 011/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 011/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 012/JsonMap.json b/tests/v1-normal-match/Round 012/JsonMap.json
deleted file mode 100644
index e95a7fe..0000000
--- a/tests/v1-normal-match/Round 012/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":12,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":73
-    },
-    "speed":6,
-    "state":"ACCELERATING",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":89
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":68
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":69
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":70
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":71
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":72
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":73
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":74
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":75
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":76
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":77
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":78
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":79
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":80
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":81
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":82
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":83
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":84
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":85
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":86
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":87
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":88
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":89
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":90
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":91
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":92
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":93
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":68
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":69
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":70
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":71
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":72
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":73
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":74
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":75
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":76
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":77
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":78
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":79
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":80
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":81
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":82
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":83
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":84
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":85
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":86
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":87
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":88
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":89
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":2,
-          "x":90
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":91
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":92
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":93
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":68
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":69
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":70
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":71
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":72
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":73
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":74
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":75
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":76
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":77
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":78
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":79
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":80
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":81
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":82
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":83
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":84
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":85
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":86
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":87
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":88
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":89
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":90
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":91
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":92
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":93
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":68
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":69
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":70
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":71
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":72
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":73
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":74
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":75
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":76
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":77
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":78
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":79
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":80
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":81
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":82
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":83
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":84
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":85
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":86
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":87
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":88
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":89
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":90
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":91
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":92
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":93
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 012/OpponentCommand.txt b/tests/v1-normal-match/Round 012/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 012/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 012/PlayerCommand.txt b/tests/v1-normal-match/Round 012/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 012/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 013/JsonMap.json b/tests/v1-normal-match/Round 013/JsonMap.json
deleted file mode 100644
index 8d8ede1..0000000
--- a/tests/v1-normal-match/Round 013/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":13,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":81
-    },
-    "speed":8,
-    "state":"ACCELERATING",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":104
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":76
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":77
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":78
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":79
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":80
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":81
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":82
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":83
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":84
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":85
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":86
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":87
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":88
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":89
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":90
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":91
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":92
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":93
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":94
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":95
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":96
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":97
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":98
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":99
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":100
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":101
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":76
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":77
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":78
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":79
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":80
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":81
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":82
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":83
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":84
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":85
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":86
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":87
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":88
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":89
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":90
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":91
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":92
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":93
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":94
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":95
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":96
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":97
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":98
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":99
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":100
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":101
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":76
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":77
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":78
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":79
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":80
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":81
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":82
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":83
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":84
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":85
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":86
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":87
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":88
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":89
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":90
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":91
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":92
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":93
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":94
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":95
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":96
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":97
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":98
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":99
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":100
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":101
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":76
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":77
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":78
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":79
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":80
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":81
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":82
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":83
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":84
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":85
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":86
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":87
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":88
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":89
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":90
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":91
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":92
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":93
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":94
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":95
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":96
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":97
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":98
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":99
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":100
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":101
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 013/OpponentCommand.txt b/tests/v1-normal-match/Round 013/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 013/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 013/PlayerCommand.txt b/tests/v1-normal-match/Round 013/PlayerCommand.txt
deleted file mode 100644
index 47076cf..0000000
--- a/tests/v1-normal-match/Round 013/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_RIGHT
diff --git a/tests/v1-normal-match/Round 014/JsonMap.json b/tests/v1-normal-match/Round 014/JsonMap.json
deleted file mode 100644
index 2bc7635..0000000
--- a/tests/v1-normal-match/Round 014/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":14,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":88
-    },
-    "speed":6,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":113
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":83
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":84
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":85
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":86
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":87
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":88
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":89
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":90
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":91
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":92
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":93
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":94
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":95
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":96
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":97
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":98
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":99
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":100
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":101
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":102
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":103
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":104
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":105
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":106
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":107
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":83
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":84
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":85
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":86
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":87
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":88
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":89
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":90
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":91
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":92
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":93
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":94
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":95
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":96
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":97
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":98
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":99
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":100
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":101
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":102
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":103
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":104
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":105
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":106
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":107
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":83
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":84
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":85
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":86
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":87
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":88
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":89
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":90
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":91
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":92
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":93
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":94
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":95
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":96
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":97
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":98
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":99
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":100
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":101
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":102
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":103
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":104
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":105
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":106
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":107
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":83
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":84
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":85
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":86
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":87
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":88
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":89
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":90
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":91
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":92
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":93
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":94
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":95
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":96
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":97
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":98
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":99
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":100
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":101
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":102
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":103
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":104
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":105
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":106
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":107
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 014/OpponentCommand.txt b/tests/v1-normal-match/Round 014/OpponentCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 014/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 014/PlayerCommand.txt b/tests/v1-normal-match/Round 014/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 014/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 015/JsonMap.json b/tests/v1-normal-match/Round 015/JsonMap.json
deleted file mode 100644
index b581996..0000000
--- a/tests/v1-normal-match/Round 015/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":15,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":103
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":122
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":98
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":99
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":100
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":101
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":102
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":103
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":104
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":105
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":106
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":107
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":109
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":110
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":111
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":112
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":113
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":114
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":115
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":118
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":119
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":120
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":121
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":122
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":98
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":99
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":100
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":101
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":102
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":103
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":104
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":105
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":106
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":107
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":109
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":110
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":111
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":112
-        },
-        "surfaceObject":2,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":113
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":114
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":115
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":118
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":119
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":120
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":121
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":122
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":2,
-          "x":123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":98
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":99
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":100
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":101
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":102
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":103
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":104
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":105
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":106
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":107
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":109
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":110
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":111
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":112
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":113
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":114
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":115
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":118
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":119
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":120
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":121
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":122
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":98
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":99
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":100
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":101
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":102
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":103
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":104
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":105
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":106
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":107
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":109
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":110
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":111
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":112
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":113
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":114
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":115
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":118
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":119
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":120
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":121
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":122
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 015/OpponentCommand.txt b/tests/v1-normal-match/Round 015/OpponentCommand.txt
deleted file mode 100644
index 47076cf..0000000
--- a/tests/v1-normal-match/Round 015/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_RIGHT
diff --git a/tests/v1-normal-match/Round 015/PlayerCommand.txt b/tests/v1-normal-match/Round 015/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 015/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 016/JsonMap.json b/tests/v1-normal-match/Round 016/JsonMap.json
deleted file mode 100644
index 26cea55..0000000
--- a/tests/v1-normal-match/Round 016/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":16,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":112
-    },
-    "speed":8,
-    "state":"HIT_OIL",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":130
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":107
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":109
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":110
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":111
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":112
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":113
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":114
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":115
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":118
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":119
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":120
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":121
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":122
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":124
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":125
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":129
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":131
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":132
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":107
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":109
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":110
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":111
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":112
-        },
-        "surfaceObject":2,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":113
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":114
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":115
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":118
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":119
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":120
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":121
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":122
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":124
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":125
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":129
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":130
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":131
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":132
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":107
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":109
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":110
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":111
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":112
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":113
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":114
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":115
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":118
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":119
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":120
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":121
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":122
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":124
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":125
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":129
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":3,
-          "x":131
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":132
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":107
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":109
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":110
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":111
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":112
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":113
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":114
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":115
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":118
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":119
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":120
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":121
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":122
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":124
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":125
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":129
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":131
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":132
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 016/OpponentCommand.txt b/tests/v1-normal-match/Round 016/OpponentCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 016/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 016/PlayerCommand.txt b/tests/v1-normal-match/Round 016/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 016/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 017/JsonMap.json b/tests/v1-normal-match/Round 017/JsonMap.json
deleted file mode 100644
index ebe6330..0000000
--- a/tests/v1-normal-match/Round 017/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":17,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":121
-    },
-    "speed":9,
-    "state":"ACCELERATING",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":139
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":118
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":119
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":120
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":121
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":122
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":124
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":125
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":129
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":131
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":132
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":134
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":137
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":139
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":140
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":141
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":118
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":119
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":120
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":121
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":122
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":124
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":125
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":129
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":130
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":131
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":132
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":134
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":137
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":139
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":140
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":141
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":118
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":119
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":120
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":121
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":122
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":124
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":125
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":129
-        },
-        "surfaceObject":2,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":131
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":132
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":134
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":137
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":139
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":3,
-          "x":140
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":141
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":118
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":119
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":120
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":121
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":122
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":124
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":125
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":129
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":131
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":132
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":134
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":137
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":139
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":140
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":141
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 017/OpponentCommand.txt b/tests/v1-normal-match/Round 017/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 017/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 017/PlayerCommand.txt b/tests/v1-normal-match/Round 017/PlayerCommand.txt
deleted file mode 100644
index 47076cf..0000000
--- a/tests/v1-normal-match/Round 017/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_RIGHT
diff --git a/tests/v1-normal-match/Round 018/JsonMap.json b/tests/v1-normal-match/Round 018/JsonMap.json
deleted file mode 100644
index 96d15a0..0000000
--- a/tests/v1-normal-match/Round 018/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":18,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":129
-    },
-    "speed":8,
-    "state":"HIT_OIL",
-    "powerups":[
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":154
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":124
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":125
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":129
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":131
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":132
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":134
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":137
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":139
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":140
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":141
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":142
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":143
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":145
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":147
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":148
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":149
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":124
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":125
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":129
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":130
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":131
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":132
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":134
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":137
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":139
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":140
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":141
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":142
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":143
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":145
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":147
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":148
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":149
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":124
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":125
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":129
-        },
-        "surfaceObject":2,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":131
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":132
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":134
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":137
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":139
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":140
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":141
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":142
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":143
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":145
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":147
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":148
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":149
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":124
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":125
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":129
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":131
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":132
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":134
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":137
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":139
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":140
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":141
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":142
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":143
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":145
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":147
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":148
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":149
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 018/OpponentCommand.txt b/tests/v1-normal-match/Round 018/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 018/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 018/PlayerCommand.txt b/tests/v1-normal-match/Round 018/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 018/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 019/JsonMap.json b/tests/v1-normal-match/Round 019/JsonMap.json
deleted file mode 100644
index 892b049..0000000
--- a/tests/v1-normal-match/Round 019/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":19,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":138
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":169
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":134
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":137
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":139
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":140
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":141
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":142
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":143
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":145
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":147
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":148
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":149
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":150
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":151
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":152
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":153
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":154
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":156
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":157
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":158
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":134
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":137
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":139
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":140
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":141
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":142
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":143
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":145
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":147
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":148
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":149
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":150
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":151
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":152
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":153
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":154
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":156
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":157
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":158
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":134
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":137
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":139
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":140
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":141
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":142
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":143
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":145
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":147
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":148
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":149
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":150
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":151
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":152
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":153
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":154
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":156
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":157
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":158
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":134
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":137
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":139
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":140
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":141
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":142
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":143
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":145
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":147
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":148
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":149
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":150
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":151
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":152
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":153
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":154
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":156
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":157
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":158
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 019/OpponentCommand.txt b/tests/v1-normal-match/Round 019/OpponentCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 019/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 019/PlayerCommand.txt b/tests/v1-normal-match/Round 019/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 019/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 020/JsonMap.json b/tests/v1-normal-match/Round 020/JsonMap.json
deleted file mode 100644
index 5c57475..0000000
--- a/tests/v1-normal-match/Round 020/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":20,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":153
-    },
-    "speed":9,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":176
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":148
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":149
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":150
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":151
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":152
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":153
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":154
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":156
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":157
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":158
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":159
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":160
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":161
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":162
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":163
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":164
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":165
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":166
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":167
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":168
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":169
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":170
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":172
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":173
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":148
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":149
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":150
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":151
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":152
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":153
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":154
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":156
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":157
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":158
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":159
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":160
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":161
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":162
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":163
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":164
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":165
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":166
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":167
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":168
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":169
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":170
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":172
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":173
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":148
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":149
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":150
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":151
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":152
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":153
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":154
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":156
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":157
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":158
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":159
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":160
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":161
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":162
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":163
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":164
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":165
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":166
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":167
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":168
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":169
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":170
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":172
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":173
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":148
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":149
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":150
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":151
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":152
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":153
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":154
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":156
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":157
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":158
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":159
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":160
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":161
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":162
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":163
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":164
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":165
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":166
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":167
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":168
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":169
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":170
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":172
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":173
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 020/OpponentCommand.txt b/tests/v1-normal-match/Round 020/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 020/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 020/PlayerCommand.txt b/tests/v1-normal-match/Round 020/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 020/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 021/JsonMap.json b/tests/v1-normal-match/Round 021/JsonMap.json
deleted file mode 100644
index 352ac30..0000000
--- a/tests/v1-normal-match/Round 021/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":21,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":168
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":185
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":163
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":164
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":165
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":166
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":167
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":168
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":169
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":170
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":172
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":173
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":174
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":175
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":176
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":177
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":178
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":179
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":181
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":182
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":185
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":188
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":163
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":164
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":165
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":166
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":167
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":168
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":169
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":170
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":172
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":173
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":174
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":175
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":176
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":177
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":178
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":179
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":181
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":182
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":185
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":2,
-          "x":186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":188
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":163
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":164
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":165
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":166
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":167
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":168
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":169
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":170
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":172
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":173
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":174
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":175
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":176
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":177
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":178
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":179
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":181
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":182
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":185
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":188
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":163
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":164
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":165
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":166
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":167
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":168
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":169
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":170
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":172
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":173
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":174
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":175
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":176
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":177
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":178
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":179
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":181
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":182
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":185
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":188
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 021/OpponentCommand.txt b/tests/v1-normal-match/Round 021/OpponentCommand.txt
deleted file mode 100644
index 47076cf..0000000
--- a/tests/v1-normal-match/Round 021/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_RIGHT
diff --git a/tests/v1-normal-match/Round 021/PlayerCommand.txt b/tests/v1-normal-match/Round 021/PlayerCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 021/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 022/JsonMap.json b/tests/v1-normal-match/Round 022/JsonMap.json
deleted file mode 100644
index 4475102..0000000
--- a/tests/v1-normal-match/Round 022/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":22,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":175
-    },
-    "speed":8,
-    "state":"TURNING_LEFT",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":192
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":170
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":172
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":173
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":174
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":175
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":176
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":177
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":178
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":179
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":181
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":182
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":185
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":188
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":189
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":190
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":191
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":192
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":193
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":194
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":195
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":170
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":172
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":173
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":174
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":175
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":176
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":177
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":178
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":179
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":181
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":182
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":185
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":188
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":189
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":190
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":191
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":192
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":193
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":194
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":195
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":170
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":172
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":173
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":174
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":175
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":176
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":177
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":178
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":179
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":181
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":182
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":185
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":188
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":189
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":190
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":191
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":192
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":3,
-          "x":193
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":194
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":195
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":170
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":172
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":173
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":174
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":175
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":176
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":177
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":178
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":179
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":181
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":182
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":185
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":188
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":189
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":190
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":191
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":192
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":193
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":194
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":195
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 022/OpponentCommand.txt b/tests/v1-normal-match/Round 022/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 022/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 022/PlayerCommand.txt b/tests/v1-normal-match/Round 022/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 022/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 023/JsonMap.json b/tests/v1-normal-match/Round 023/JsonMap.json
deleted file mode 100644
index 72687ff..0000000
--- a/tests/v1-normal-match/Round 023/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":23,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":184
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":207
-    },
-    "speed":15
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":179
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":181
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":182
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":185
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":188
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":189
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":190
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":191
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":192
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":193
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":194
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":195
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":196
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":197
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":198
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":199
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":200
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":201
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":203
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":204
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":179
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":181
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":182
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":185
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":188
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":189
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":190
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":191
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":192
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":193
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":194
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":195
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":196
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":197
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":198
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":199
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":200
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":201
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":203
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":204
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":179
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":181
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":182
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":185
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":188
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":189
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":190
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":191
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":192
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":193
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":194
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":195
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":196
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":197
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":198
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":199
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":200
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":201
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":203
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":204
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":179
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":181
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":182
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":185
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":188
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":189
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":190
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":191
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":192
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":193
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":194
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":195
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":196
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":197
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":198
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":199
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":200
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":201
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":203
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":204
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 023/OpponentCommand.txt b/tests/v1-normal-match/Round 023/OpponentCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 023/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 023/PlayerCommand.txt b/tests/v1-normal-match/Round 023/PlayerCommand.txt
deleted file mode 100644
index 47076cf..0000000
--- a/tests/v1-normal-match/Round 023/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_RIGHT
diff --git a/tests/v1-normal-match/Round 024/JsonMap.json b/tests/v1-normal-match/Round 024/JsonMap.json
deleted file mode 100644
index 8563bd8..0000000
--- a/tests/v1-normal-match/Round 024/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":24,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":191
-    },
-    "speed":8,
-    "state":"TURNING_RIGHT",
-    "powerups":[
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":222
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":188
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":189
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":190
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":191
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":192
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":193
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":194
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":195
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":196
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":197
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":198
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":199
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":200
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":201
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":203
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":204
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":205
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":206
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":207
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":208
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":209
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":210
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":211
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":188
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":189
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":190
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":191
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":192
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":193
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":194
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":195
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":196
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":197
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":198
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":199
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":200
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":201
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":203
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":204
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":205
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":206
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":207
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":208
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":209
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":210
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":211
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":188
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":189
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":190
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":191
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":192
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":193
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":194
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":195
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":196
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":197
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":198
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":199
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":200
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":201
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":203
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":204
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":205
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":206
-        },
-        "surfaceObject":2,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":207
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":208
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":209
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":210
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":211
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":188
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":189
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":190
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":191
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":192
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":193
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":194
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":195
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":196
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":197
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":198
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":199
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":200
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":201
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":203
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":204
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":205
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":206
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":207
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":208
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":209
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":210
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":211
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 024/OpponentCommand.txt b/tests/v1-normal-match/Round 024/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 024/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 024/PlayerCommand.txt b/tests/v1-normal-match/Round 024/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 024/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 025/JsonMap.json b/tests/v1-normal-match/Round 025/JsonMap.json
deleted file mode 100644
index 013cc30..0000000
--- a/tests/v1-normal-match/Round 025/JsonMap.json
+++ /dev/null
@@ -1,872 +0,0 @@
-{
-  "currentRound":25,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":206
-    },
-    "speed":9,
-    "state":"HIT_OIL",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":237
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":201
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":203
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":204
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":205
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":206
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":207
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":208
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":209
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":210
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":211
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":212
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":213
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":214
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":215
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":216
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":217
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":218
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":219
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":220
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":221
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":222
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":223
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":224
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":225
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":226
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":201
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":203
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":204
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":205
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":206
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":207
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":208
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":209
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":210
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":211
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":212
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":213
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":214
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":215
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":216
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":217
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":218
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":219
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":220
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":221
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":222
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":223
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":224
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":225
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":226
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":201
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":203
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":204
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":205
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":206
-        },
-        "surfaceObject":2,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":207
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":208
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":209
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":210
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":211
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":212
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":213
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":214
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":215
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":216
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":217
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":218
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":219
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":220
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":221
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":222
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":223
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":224
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":225
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":226
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":201
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":203
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":204
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":205
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":206
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":207
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":208
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":209
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":210
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":211
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":212
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":213
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":214
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":215
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":216
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":217
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":218
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":219
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":220
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":221
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":222
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":223
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":224
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":225
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":226
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 025/OpponentCommand.txt b/tests/v1-normal-match/Round 025/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 025/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 025/PlayerCommand.txt b/tests/v1-normal-match/Round 025/PlayerCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 025/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 026/JsonMap.json b/tests/v1-normal-match/Round 026/JsonMap.json
deleted file mode 100644
index e13a551..0000000
--- a/tests/v1-normal-match/Round 026/JsonMap.json
+++ /dev/null
@@ -1,871 +0,0 @@
-{
-  "currentRound":26,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":215
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":252
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":210
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":211
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":212
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":213
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":214
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":215
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":216
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":217
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":218
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":219
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":220
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":221
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":222
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":223
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":224
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":225
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":226
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":227
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":228
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":229
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":230
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":231
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":232
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":233
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":234
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":235
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":210
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":211
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":212
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":213
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":214
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":215
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":216
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":217
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":218
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":219
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":220
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":221
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":222
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":223
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":224
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":225
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":226
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":227
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":228
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":229
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":230
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":231
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":232
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":233
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":234
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":235
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":210
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":211
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":212
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":213
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":214
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":215
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":216
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":217
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":218
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":219
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":220
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":221
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":222
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":223
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":224
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":225
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":226
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":227
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":228
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":229
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":230
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":231
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":232
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":233
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":234
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":235
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":210
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":211
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":212
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":213
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":214
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":215
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":216
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":217
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":218
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":219
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":220
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":221
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":222
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":223
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":224
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":225
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":226
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":227
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":228
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":229
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":230
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":231
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":232
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":233
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":234
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":235
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 026/OpponentCommand.txt b/tests/v1-normal-match/Round 026/OpponentCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 026/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 026/PlayerCommand.txt b/tests/v1-normal-match/Round 026/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 026/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 027/JsonMap.json b/tests/v1-normal-match/Round 027/JsonMap.json
deleted file mode 100644
index 048bcc4..0000000
--- a/tests/v1-normal-match/Round 027/JsonMap.json
+++ /dev/null
@@ -1,871 +0,0 @@
-{
-  "currentRound":27,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":230
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":261
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":225
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":226
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":227
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":228
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":229
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":230
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":231
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":232
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":233
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":234
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":235
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":236
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":237
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":238
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":239
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":240
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":241
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":242
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":243
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":244
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":245
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":246
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":247
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":248
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":249
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":250
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":225
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":226
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":227
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":228
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":229
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":230
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":231
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":232
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":233
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":234
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":235
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":236
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":237
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":238
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":239
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":240
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":241
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":242
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":243
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":244
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":245
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":246
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":247
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":248
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":249
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":250
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":225
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":226
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":227
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":228
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":229
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":230
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":231
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":232
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":233
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":234
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":235
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":236
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":237
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":238
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":239
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":240
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":241
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":242
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":243
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":244
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":245
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":246
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":247
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":248
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":249
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":250
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":225
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":226
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":227
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":228
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":229
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":230
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":231
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":232
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":233
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":234
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":235
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":236
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":237
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":238
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":239
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":240
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":241
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":242
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":243
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":244
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":245
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":246
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":247
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":248
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":249
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":250
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 027/OpponentCommand.txt b/tests/v1-normal-match/Round 027/OpponentCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 027/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 027/PlayerCommand.txt b/tests/v1-normal-match/Round 027/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 027/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 028/JsonMap.json b/tests/v1-normal-match/Round 028/JsonMap.json
deleted file mode 100644
index 7c995af..0000000
--- a/tests/v1-normal-match/Round 028/JsonMap.json
+++ /dev/null
@@ -1,871 +0,0 @@
-{
-  "currentRound":28,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":239
-    },
-    "speed":6,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":270
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":234
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":235
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":236
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":237
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":238
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":239
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":240
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":241
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":242
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":243
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":244
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":245
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":246
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":247
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":248
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":249
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":250
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":251
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":252
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":253
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":254
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":255
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":256
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":257
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":258
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":259
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":234
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":235
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":236
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":237
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":238
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":239
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":240
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":241
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":242
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":243
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":244
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":245
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":246
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":247
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":248
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":249
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":250
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":251
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":252
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":253
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":254
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":255
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":256
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":257
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":258
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":259
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":234
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":235
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":236
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":237
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":238
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":239
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":240
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":241
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":242
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":243
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":244
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":245
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":246
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":247
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":248
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":249
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":250
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":251
-        },
-        "surfaceObject":2,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":252
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":253
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":254
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":255
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":256
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":257
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":258
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":259
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":234
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":235
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":236
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":237
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":238
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":239
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":240
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":241
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":242
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":243
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":244
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":245
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":246
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":247
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":248
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":249
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":250
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":251
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":252
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":253
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":254
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":255
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":256
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":257
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":258
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":259
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 028/OpponentCommand.txt b/tests/v1-normal-match/Round 028/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 028/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 028/PlayerCommand.txt b/tests/v1-normal-match/Round 028/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 028/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 029/JsonMap.json b/tests/v1-normal-match/Round 029/JsonMap.json
deleted file mode 100644
index dbb763f..0000000
--- a/tests/v1-normal-match/Round 029/JsonMap.json
+++ /dev/null
@@ -1,871 +0,0 @@
-{
-  "currentRound":29,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":254
-    },
-    "speed":8,
-    "state":"HIT_OIL",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":279
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":249
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":250
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":251
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":252
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":253
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":254
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":255
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":256
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":257
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":258
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":259
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":260
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":261
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":262
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":263
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":264
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":265
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":266
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":267
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":268
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":269
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":270
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":271
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":272
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":273
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":274
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":249
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":250
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":251
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":252
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":253
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":254
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":255
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":256
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":257
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":258
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":259
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":260
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":261
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":262
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":263
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":264
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":265
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":266
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":267
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":268
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":269
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":270
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":271
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":272
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":273
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":274
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":249
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":250
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":251
-        },
-        "surfaceObject":2,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":252
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":253
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":254
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":255
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":256
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":257
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":258
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":259
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":260
-        },
-        "surfaceObject":2,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":261
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":262
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":263
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":264
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":265
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":266
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":267
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":268
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":269
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":270
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":271
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":272
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":273
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":274
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":249
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":250
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":251
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":252
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":253
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":254
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":255
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":256
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":257
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":258
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":259
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":260
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":261
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":262
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":263
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":264
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":265
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":266
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":267
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":268
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":269
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":270
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":271
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":272
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":273
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":274
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 029/OpponentCommand.txt b/tests/v1-normal-match/Round 029/OpponentCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 029/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 029/PlayerCommand.txt b/tests/v1-normal-match/Round 029/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 029/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 030/JsonMap.json b/tests/v1-normal-match/Round 030/JsonMap.json
deleted file mode 100644
index e01c9ff..0000000
--- a/tests/v1-normal-match/Round 030/JsonMap.json
+++ /dev/null
@@ -1,872 +0,0 @@
-{
-  "currentRound":30,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":263
-    },
-    "speed":6,
-    "state":"HIT_OIL",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":288
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":258
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":259
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":260
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":261
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":262
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":263
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":264
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":265
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":266
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":267
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":268
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":269
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":270
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":271
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":272
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":273
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":274
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":275
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":276
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":277
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":278
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":279
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":280
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":281
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":282
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":283
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":258
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":259
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":260
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":261
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":262
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":263
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":264
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":265
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":266
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":267
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":268
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":269
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":270
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":271
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":272
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":273
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":274
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":275
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":276
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":277
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":278
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":279
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":280
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":281
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":282
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":283
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":258
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":259
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":260
-        },
-        "surfaceObject":2,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":261
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":262
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":263
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":264
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":265
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":266
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":267
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":268
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":269
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":270
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":271
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":272
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":273
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":274
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":275
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":276
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":277
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":278
-        },
-        "surfaceObject":2,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":279
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":280
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":281
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":282
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":283
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":258
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":259
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":260
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":261
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":262
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":263
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":264
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":265
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":266
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":267
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":268
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":269
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":270
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":271
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":272
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":273
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":274
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":275
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":276
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":277
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":278
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":279
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":280
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":281
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":282
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":283
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 030/OpponentCommand.txt b/tests/v1-normal-match/Round 030/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 030/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 030/PlayerCommand.txt b/tests/v1-normal-match/Round 030/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 030/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 031/JsonMap.json b/tests/v1-normal-match/Round 031/JsonMap.json
deleted file mode 100644
index 700e7e7..0000000
--- a/tests/v1-normal-match/Round 031/JsonMap.json
+++ /dev/null
@@ -1,872 +0,0 @@
-{
-  "currentRound":31,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":271
-    },
-    "speed":8,
-    "state":"ACCELERATING",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":297
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":266
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":267
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":268
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":269
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":270
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":271
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":272
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":273
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":274
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":275
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":276
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":277
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":278
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":279
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":280
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":281
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":282
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":283
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":284
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":285
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":286
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":287
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":288
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":289
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":290
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":266
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":267
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":268
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":269
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":270
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":271
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":272
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":273
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":274
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":275
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":276
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":277
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":278
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":279
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":280
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":281
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":282
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":283
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":284
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":285
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":286
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":287
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":288
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":289
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":290
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":266
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":267
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":268
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":269
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":270
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":271
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":272
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":273
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":274
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":275
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":276
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":277
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":278
-        },
-        "surfaceObject":2,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":279
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":280
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":281
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":282
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":283
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":284
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":285
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":286
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":287
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":288
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":289
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":290
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":266
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":267
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":268
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":269
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":270
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":271
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":272
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":273
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":274
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":275
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":276
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":277
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":278
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":279
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":280
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":281
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":282
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":283
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":284
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":285
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":286
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":287
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":288
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":289
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":290
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 031/OpponentCommand.txt b/tests/v1-normal-match/Round 031/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 031/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 031/PlayerCommand.txt b/tests/v1-normal-match/Round 031/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 031/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 032/JsonMap.json b/tests/v1-normal-match/Round 032/JsonMap.json
deleted file mode 100644
index 6d203d9..0000000
--- a/tests/v1-normal-match/Round 032/JsonMap.json
+++ /dev/null
@@ -1,872 +0,0 @@
-{
-  "currentRound":32,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":280
-    },
-    "speed":8,
-    "state":"HIT_OIL",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":305
-    },
-    "speed":3
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":275
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":276
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":277
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":278
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":279
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":280
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":281
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":282
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":283
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":284
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":285
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":286
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":287
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":288
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":289
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":290
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":292
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":293
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":294
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":295
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":296
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":297
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":298
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":299
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":300
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":275
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":276
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":277
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":278
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":279
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":280
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":281
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":282
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":283
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":284
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":285
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":286
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":287
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":288
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":289
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":290
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":292
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":293
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":294
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":295
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":296
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":297
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":298
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":299
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":300
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":275
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":276
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":277
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":278
-        },
-        "surfaceObject":2,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":279
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":280
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":281
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":282
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":283
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":284
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":285
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":286
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":287
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":288
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":289
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":290
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":292
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":293
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":294
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":295
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":296
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":297
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":298
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":299
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":300
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":275
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":276
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":277
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":278
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":279
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":280
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":281
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":282
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":283
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":284
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":285
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":286
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":287
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":288
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":289
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":290
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":292
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":293
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":294
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":295
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":296
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":297
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":298
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":299
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":300
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 032/OpponentCommand.txt b/tests/v1-normal-match/Round 032/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 032/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 032/PlayerCommand.txt b/tests/v1-normal-match/Round 032/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 032/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 033/JsonMap.json b/tests/v1-normal-match/Round 033/JsonMap.json
deleted file mode 100644
index 8c4c303..0000000
--- a/tests/v1-normal-match/Round 033/JsonMap.json
+++ /dev/null
@@ -1,872 +0,0 @@
-{
-  "currentRound":33,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":289
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":311
-    },
-    "speed":3
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":284
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":285
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":286
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":287
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":288
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":289
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":290
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":292
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":293
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":294
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":295
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":296
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":297
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":298
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":299
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":300
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":301
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":302
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":303
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":304
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":305
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":307
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":308
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":284
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":285
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":286
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":287
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":288
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":289
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":290
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":292
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":293
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":294
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":295
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":296
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":297
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":298
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":299
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":300
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":301
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":302
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":303
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":304
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":305
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":307
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":308
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":284
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":285
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":286
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":287
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":288
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":289
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":290
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":292
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":293
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":294
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":295
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":296
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":297
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":298
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":299
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":300
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":301
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":302
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":303
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":304
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":305
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":307
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":308
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":284
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":285
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":286
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":287
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":288
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":289
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":290
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":292
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":293
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":294
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":295
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":296
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":297
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":298
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":299
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":300
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":301
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":302
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":303
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":304
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":305
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":307
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":308
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 033/OpponentCommand.txt b/tests/v1-normal-match/Round 033/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 033/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 033/PlayerCommand.txt b/tests/v1-normal-match/Round 033/PlayerCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 033/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 034/JsonMap.json b/tests/v1-normal-match/Round 034/JsonMap.json
deleted file mode 100644
index 727724e..0000000
--- a/tests/v1-normal-match/Round 034/JsonMap.json
+++ /dev/null
@@ -1,872 +0,0 @@
-{
-  "currentRound":34,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":296
-    },
-    "speed":8,
-    "state":"TURNING_LEFT",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":317
-    },
-    "speed":3
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":292
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":293
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":294
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":295
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":296
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":297
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":298
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":299
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":300
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":301
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":302
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":303
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":304
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":305
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":307
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":308
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":310
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":311
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":312
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":313
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":314
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":316
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":292
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":293
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":294
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":295
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":296
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":297
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":298
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":299
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":300
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":301
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":302
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":303
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":304
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":305
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":307
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":308
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":310
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":311
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":312
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":313
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":314
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":316
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":292
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":293
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":294
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":295
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":296
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":297
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":298
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":299
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":300
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":301
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":302
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":303
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":304
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":305
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":307
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":308
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":310
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":311
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":312
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":313
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":314
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":316
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":292
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":293
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":294
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":295
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":296
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":297
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":298
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":299
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":300
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":301
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":302
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":303
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":304
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":305
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":307
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":308
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":310
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":311
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":312
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":313
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":314
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":316
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 034/OpponentCommand.txt b/tests/v1-normal-match/Round 034/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 034/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 034/PlayerCommand.txt b/tests/v1-normal-match/Round 034/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 034/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 035/JsonMap.json b/tests/v1-normal-match/Round 035/JsonMap.json
deleted file mode 100644
index 45ec2cc..0000000
--- a/tests/v1-normal-match/Round 035/JsonMap.json
+++ /dev/null
@@ -1,872 +0,0 @@
-{
-  "currentRound":35,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":305
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":323
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":300
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":301
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":302
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":303
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":304
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":305
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":307
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":308
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":310
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":311
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":312
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":313
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":314
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":316
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":318
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":319
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":320
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":322
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":323
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":300
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":301
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":302
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":303
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":304
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":305
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":307
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":308
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":310
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":311
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":312
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":313
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":314
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":316
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":318
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":319
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":320
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":322
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":323
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":300
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":301
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":302
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":303
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":304
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":305
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":307
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":308
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":310
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":311
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":312
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":313
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":314
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":316
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":318
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":319
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":320
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":322
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":323
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":3,
-          "x":324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":300
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":301
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":302
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":303
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":304
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":305
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":307
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":308
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":310
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":311
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":312
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":313
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":314
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":316
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":318
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":319
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":320
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":322
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":323
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 035/OpponentCommand.txt b/tests/v1-normal-match/Round 035/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 035/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 035/PlayerCommand.txt b/tests/v1-normal-match/Round 035/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 035/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 036/JsonMap.json b/tests/v1-normal-match/Round 036/JsonMap.json
deleted file mode 100644
index 4058805..0000000
--- a/tests/v1-normal-match/Round 036/JsonMap.json
+++ /dev/null
@@ -1,873 +0,0 @@
-{
-  "currentRound":36,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":314
-    },
-    "speed":6,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":331
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":310
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":311
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":312
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":313
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":314
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":316
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":318
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":319
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":320
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":322
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":323
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":327
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":328
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":330
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":331
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":332
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":334
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":310
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":311
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":312
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":313
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":314
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":316
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":318
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":319
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":320
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":322
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":323
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":327
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":328
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":330
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":331
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":332
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":334
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":310
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":311
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":312
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":313
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":314
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":316
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":318
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":319
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":320
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":322
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":323
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":327
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":328
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":330
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":331
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":3,
-          "x":332
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":334
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":310
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":311
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":312
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":313
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":314
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":316
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":318
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":319
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":320
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":322
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":323
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":327
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":328
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":330
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":331
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":332
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":334
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 036/OpponentCommand.txt b/tests/v1-normal-match/Round 036/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 036/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 036/PlayerCommand.txt b/tests/v1-normal-match/Round 036/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 036/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 037/JsonMap.json b/tests/v1-normal-match/Round 037/JsonMap.json
deleted file mode 100644
index 0f9869c..0000000
--- a/tests/v1-normal-match/Round 037/JsonMap.json
+++ /dev/null
@@ -1,873 +0,0 @@
-{
-  "currentRound":37,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":322
-    },
-    "speed":8,
-    "state":"ACCELERATING",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":346
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":318
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":319
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":320
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":322
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":323
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":327
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":328
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":330
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":331
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":332
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":334
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":335
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":336
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":337
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":338
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":339
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":340
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":341
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":342
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":318
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":319
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":320
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":322
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":323
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":327
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":328
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":330
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":331
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":332
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":334
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":335
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":336
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":337
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":338
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":339
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":340
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":341
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":342
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":318
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":319
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":320
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":322
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":323
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":327
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":328
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":330
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":331
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":332
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":334
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":335
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":336
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":337
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":338
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":339
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":340
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":341
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":342
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":318
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":319
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":320
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":322
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":323
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":327
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":328
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":330
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":331
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":332
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":334
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":335
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":336
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":337
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":338
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":339
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":340
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":341
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":342
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 037/OpponentCommand.txt b/tests/v1-normal-match/Round 037/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 037/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 037/PlayerCommand.txt b/tests/v1-normal-match/Round 037/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 037/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 038/JsonMap.json b/tests/v1-normal-match/Round 038/JsonMap.json
deleted file mode 100644
index 288a199..0000000
--- a/tests/v1-normal-match/Round 038/JsonMap.json
+++ /dev/null
@@ -1,874 +0,0 @@
-{
-  "currentRound":38,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":331
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":355
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":327
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":328
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":330
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":331
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":332
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":334
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":335
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":336
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":337
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":338
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":339
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":340
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":341
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":342
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":343
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":344
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":345
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":346
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":347
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":348
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":349
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":350
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":351
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":327
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":328
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":330
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":331
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":332
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":334
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":335
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":336
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":337
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":338
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":339
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":340
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":341
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":342
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":343
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":344
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":345
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":346
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":347
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":348
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":349
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":350
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":351
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":327
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":328
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":330
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":331
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":332
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":334
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":335
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":336
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":337
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":338
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":339
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":340
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":341
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":342
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":343
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":344
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":345
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":346
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":347
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":348
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":349
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":350
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":351
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":327
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":328
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":330
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":331
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":332
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":334
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":335
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":336
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":337
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":338
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":339
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":340
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":341
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":342
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":343
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":344
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":345
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":346
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":347
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":348
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":349
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":350
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":351
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 038/OpponentCommand.txt b/tests/v1-normal-match/Round 038/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 038/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 038/PlayerCommand.txt b/tests/v1-normal-match/Round 038/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 038/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 039/JsonMap.json b/tests/v1-normal-match/Round 039/JsonMap.json
deleted file mode 100644
index 3957249..0000000
--- a/tests/v1-normal-match/Round 039/JsonMap.json
+++ /dev/null
@@ -1,874 +0,0 @@
-{
-  "currentRound":39,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":346
-    },
-    "speed":9,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":370
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":341
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":342
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":343
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":344
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":345
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":346
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":347
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":348
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":349
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":350
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":351
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":352
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":353
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":354
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":355
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":356
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":357
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":358
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":359
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":360
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":361
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":362
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":363
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":364
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":341
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":342
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":343
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":344
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":345
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":346
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":347
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":348
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":349
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":350
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":351
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":352
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":353
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":354
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":355
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":356
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":357
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":358
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":359
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":360
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":361
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":362
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":363
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":364
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":341
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":342
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":343
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":344
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":345
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":346
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":347
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":348
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":349
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":350
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":351
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":352
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":353
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":354
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":355
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":356
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":357
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":358
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":359
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":360
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":361
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":362
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":363
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":364
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":341
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":342
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":343
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":344
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":345
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":346
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":347
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":348
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":349
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":350
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":351
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":352
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":353
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":354
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":355
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":356
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":357
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":358
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":359
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":360
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":361
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":362
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":363
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":364
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 039/OpponentCommand.txt b/tests/v1-normal-match/Round 039/OpponentCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 039/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 039/PlayerCommand.txt b/tests/v1-normal-match/Round 039/PlayerCommand.txt
deleted file mode 100644
index 47076cf..0000000
--- a/tests/v1-normal-match/Round 039/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_RIGHT
diff --git a/tests/v1-normal-match/Round 040/JsonMap.json b/tests/v1-normal-match/Round 040/JsonMap.json
deleted file mode 100644
index e21a569..0000000
--- a/tests/v1-normal-match/Round 040/JsonMap.json
+++ /dev/null
@@ -1,875 +0,0 @@
-{
-  "currentRound":40,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":354
-    },
-    "speed":9,
-    "state":"TURNING_RIGHT",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "BOOST",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":378
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":349
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":350
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":351
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":352
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":353
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":354
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":355
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":356
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":357
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":358
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":359
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":360
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":361
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":362
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":363
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":364
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":367
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":368
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":369
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":370
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":371
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":372
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":373
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":374
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":349
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":350
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":351
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":352
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":353
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":354
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":355
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":356
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":357
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":358
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":359
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":360
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":361
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":362
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":363
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":364
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":367
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":368
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":369
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":370
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":371
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":372
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":373
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":374
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":349
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":350
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":351
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":352
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":353
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":354
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":355
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":356
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":357
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":358
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":359
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":360
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":361
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":362
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":363
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":364
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":367
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":368
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":369
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":370
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":371
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":372
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":373
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":374
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":349
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":350
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":351
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":352
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":353
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":354
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":355
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":356
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":357
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":358
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":359
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":360
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":361
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":362
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":363
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":364
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":367
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":368
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":369
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":370
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":371
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":372
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":373
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":374
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 040/OpponentCommand.txt b/tests/v1-normal-match/Round 040/OpponentCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 040/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 040/PlayerCommand.txt b/tests/v1-normal-match/Round 040/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 040/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 041/JsonMap.json b/tests/v1-normal-match/Round 041/JsonMap.json
deleted file mode 100644
index 9935301..0000000
--- a/tests/v1-normal-match/Round 041/JsonMap.json
+++ /dev/null
@@ -1,874 +0,0 @@
-{
-  "currentRound":41,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":369
-    },
-    "speed":9,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":387
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":364
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":367
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":368
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":369
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":370
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":371
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":372
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":373
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":374
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":375
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":376
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":377
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":378
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":379
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":380
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":381
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":382
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":383
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":384
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":385
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":386
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":387
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":388
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":389
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":364
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":367
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":368
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":369
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":370
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":371
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":372
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":373
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":374
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":375
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":376
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":377
-        },
-        "surfaceObject":2,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":378
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":379
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":380
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":381
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":382
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":383
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":384
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":385
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":386
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":387
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":2,
-          "x":388
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":389
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":364
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":367
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":368
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":369
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":370
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":371
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":372
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":373
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":374
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":375
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":376
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":377
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":378
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":379
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":380
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":381
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":382
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":383
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":384
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":385
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":386
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":387
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":388
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":389
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":364
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":367
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":368
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":369
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":370
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":371
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":372
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":373
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":374
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":375
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":376
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":377
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":378
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":379
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":380
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":381
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":382
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":383
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":384
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":385
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":386
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":387
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":388
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":389
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 041/OpponentCommand.txt b/tests/v1-normal-match/Round 041/OpponentCommand.txt
deleted file mode 100644
index 1baaf21..0000000
--- a/tests/v1-normal-match/Round 041/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: NOTHING
diff --git a/tests/v1-normal-match/Round 041/PlayerCommand.txt b/tests/v1-normal-match/Round 041/PlayerCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 041/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 042/JsonMap.json b/tests/v1-normal-match/Round 042/JsonMap.json
deleted file mode 100644
index a10f08b..0000000
--- a/tests/v1-normal-match/Round 042/JsonMap.json
+++ /dev/null
@@ -1,875 +0,0 @@
-{
-  "currentRound":42,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":377
-    },
-    "speed":8,
-    "state":"HIT_OIL",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "BOOST",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":396
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":372
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":373
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":374
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":375
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":376
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":377
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":378
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":379
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":380
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":381
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":382
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":383
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":384
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":385
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":386
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":387
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":388
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":389
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":390
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":391
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":392
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":393
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":394
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":395
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":396
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":372
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":373
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":374
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":375
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":376
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":377
-        },
-        "surfaceObject":2,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":378
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":379
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":380
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":381
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":382
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":383
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":384
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":385
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":386
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":387
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":388
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":389
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":390
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":391
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":392
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":393
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":394
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":395
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":396
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":2,
-          "x":397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":372
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":373
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":374
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":375
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":376
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":377
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":378
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":379
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":380
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":381
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":382
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":383
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":384
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":385
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":386
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":387
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":388
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":389
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":390
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":391
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":392
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":393
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":394
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":395
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":396
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":372
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":373
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":374
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":375
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":376
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":377
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":378
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":379
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":380
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":381
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":382
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":383
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":384
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":385
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":386
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":387
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":388
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":389
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":390
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":391
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":392
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":393
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":394
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":395
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":396
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 042/OpponentCommand.txt b/tests/v1-normal-match/Round 042/OpponentCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 042/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 042/PlayerCommand.txt b/tests/v1-normal-match/Round 042/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 042/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 043/JsonMap.json b/tests/v1-normal-match/Round 043/JsonMap.json
deleted file mode 100644
index 29fe592..0000000
--- a/tests/v1-normal-match/Round 043/JsonMap.json
+++ /dev/null
@@ -1,875 +0,0 @@
-{
-  "currentRound":43,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":392
-    },
-    "speed":15,
-    "state":"USED_BOOST",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "BOOST",
-      "BOOST"
-    ],
-    "boosting":true,
-    "boostCounter":5
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":405
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":387
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":388
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":389
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":390
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":391
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":392
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":393
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":394
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":395
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":396
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":398
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":399
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":400
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":401
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":402
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":403
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":406
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":407
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":409
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":410
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":411
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":387
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":388
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":389
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":390
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":391
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":392
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":393
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":394
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":395
-        },
-        "surfaceObject":2,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":396
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":398
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":399
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":400
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":401
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":402
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":403
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":2,
-          "x":406
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":407
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":409
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":410
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":411
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":387
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":388
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":389
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":390
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":391
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":392
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":393
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":394
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":395
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":396
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":398
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":399
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":400
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":401
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":402
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":403
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":406
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":407
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":409
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":410
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":411
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":387
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":388
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":389
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":390
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":391
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":392
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":393
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":394
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":395
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":396
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":398
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":399
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":400
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":401
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":402
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":403
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":406
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":407
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":409
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":410
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":411
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 043/OpponentCommand.txt b/tests/v1-normal-match/Round 043/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 043/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 043/PlayerCommand.txt b/tests/v1-normal-match/Round 043/PlayerCommand.txt
deleted file mode 100644
index 47076cf..0000000
--- a/tests/v1-normal-match/Round 043/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_RIGHT
diff --git a/tests/v1-normal-match/Round 044/JsonMap.json b/tests/v1-normal-match/Round 044/JsonMap.json
deleted file mode 100644
index 654c919..0000000
--- a/tests/v1-normal-match/Round 044/JsonMap.json
+++ /dev/null
@@ -1,875 +0,0 @@
-{
-  "currentRound":44,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":406
-    },
-    "speed":9,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "BOOST",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":420
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":401
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":402
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":403
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":406
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":407
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":409
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":410
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":411
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":413
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":414
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":416
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":418
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":419
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":422
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":423
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":424
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":425
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":426
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":401
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":402
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":403
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":406
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":407
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":409
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":410
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":411
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":413
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":414
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":416
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":418
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":2,
-          "x":421
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":422
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":423
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":424
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":425
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":426
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":401
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":402
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":403
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":406
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":407
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":409
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":410
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":411
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":413
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":414
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":416
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":418
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":422
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":423
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":424
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":425
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":426
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":401
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":402
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":403
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":406
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":407
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":409
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":410
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":411
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":413
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":414
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":416
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":418
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":419
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":420
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":422
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":423
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":424
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":425
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":426
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 044/OpponentCommand.txt b/tests/v1-normal-match/Round 044/OpponentCommand.txt
deleted file mode 100644
index 47076cf..0000000
--- a/tests/v1-normal-match/Round 044/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_RIGHT
diff --git a/tests/v1-normal-match/Round 044/PlayerCommand.txt b/tests/v1-normal-match/Round 044/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 044/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 045/JsonMap.json b/tests/v1-normal-match/Round 045/JsonMap.json
deleted file mode 100644
index 639cea1..0000000
--- a/tests/v1-normal-match/Round 045/JsonMap.json
+++ /dev/null
@@ -1,874 +0,0 @@
-{
-  "currentRound":45,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":421
-    },
-    "speed":6,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":428
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":416
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":418
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":419
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":422
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":423
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":424
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":425
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":426
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":427
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":428
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":429
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":430
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":431
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":432
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":433
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":434
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":435
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":436
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":437
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":438
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":439
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":440
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":441
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":416
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":418
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":421
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":422
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":423
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":424
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":425
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":426
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":427
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":428
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":429
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":430
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":431
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":432
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":433
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":434
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":435
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":436
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":437
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":438
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":439
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":440
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":441
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":416
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":418
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":422
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":423
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":424
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":425
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":426
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":427
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":428
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":3,
-          "x":429
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":430
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":431
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":432
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":433
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":434
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":435
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":436
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":437
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":438
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":439
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":440
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":441
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":416
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":418
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":419
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":420
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":422
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":423
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":424
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":425
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":426
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":427
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":428
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":429
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":430
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":431
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":432
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":433
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":434
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":435
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":436
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":437
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":438
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":439
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":440
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":441
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 045/OpponentCommand.txt b/tests/v1-normal-match/Round 045/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 045/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 045/PlayerCommand.txt b/tests/v1-normal-match/Round 045/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 045/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 046/JsonMap.json b/tests/v1-normal-match/Round 046/JsonMap.json
deleted file mode 100644
index 1ea8898..0000000
--- a/tests/v1-normal-match/Round 046/JsonMap.json
+++ /dev/null
@@ -1,873 +0,0 @@
-{
-  "currentRound":46,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":436
-    },
-    "speed":9,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":437
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":431
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":432
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":433
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":434
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":435
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":436
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":437
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":438
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":439
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":440
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":441
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":442
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":443
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":444
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":445
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":446
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":447
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":448
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":449
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":450
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":451
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":452
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":453
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":454
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":455
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":456
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":431
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":432
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":433
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":434
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":435
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":436
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":437
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":438
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":439
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":440
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":441
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":442
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":443
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":444
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":445
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":446
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":447
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":448
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":449
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":450
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":451
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":452
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":453
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":454
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":455
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":456
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":431
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":432
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":433
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":434
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":435
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":436
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":437
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":3,
-          "x":438
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":439
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":440
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":441
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":442
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":443
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":444
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":445
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":446
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":447
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":448
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":449
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":450
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":451
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":452
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":453
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":454
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":455
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":456
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":431
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":432
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":433
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":434
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":435
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":436
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":437
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":438
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":439
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":440
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":441
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":442
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":443
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":444
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":445
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":446
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":447
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":448
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":449
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":450
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":451
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":452
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":453
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":454
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":455
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":456
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 046/OpponentCommand.txt b/tests/v1-normal-match/Round 046/OpponentCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 046/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 046/PlayerCommand.txt b/tests/v1-normal-match/Round 046/PlayerCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 046/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 047/JsonMap.json b/tests/v1-normal-match/Round 047/JsonMap.json
deleted file mode 100644
index a89af36..0000000
--- a/tests/v1-normal-match/Round 047/JsonMap.json
+++ /dev/null
@@ -1,872 +0,0 @@
-{
-  "currentRound":47,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":445
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":446
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":440
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":441
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":442
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":443
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":444
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":445
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":446
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":447
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":448
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":449
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":450
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":451
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":452
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":453
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":454
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":455
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":456
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":457
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":458
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":459
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":460
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":461
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":462
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":463
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":464
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":465
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":440
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":441
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":442
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":443
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":444
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":445
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":446
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":447
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":448
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":449
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":450
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":451
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":452
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":453
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":454
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":455
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":456
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":457
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":458
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":459
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":460
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":461
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":462
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":463
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":464
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":465
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":440
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":441
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":442
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":443
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":444
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":445
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":446
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":3,
-          "x":447
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":448
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":449
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":450
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":451
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":452
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":453
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":454
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":455
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":456
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":457
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":458
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":459
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":460
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":461
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":462
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":463
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":464
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":465
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":440
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":441
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":442
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":443
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":444
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":445
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":446
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":447
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":448
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":449
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":450
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":451
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":452
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":453
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":454
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":455
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":456
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":457
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":458
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":459
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":460
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":461
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":462
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":463
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":464
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":465
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 047/OpponentCommand.txt b/tests/v1-normal-match/Round 047/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 047/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 047/PlayerCommand.txt b/tests/v1-normal-match/Round 047/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 047/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 048/JsonMap.json b/tests/v1-normal-match/Round 048/JsonMap.json
deleted file mode 100644
index 706af04..0000000
--- a/tests/v1-normal-match/Round 048/JsonMap.json
+++ /dev/null
@@ -1,872 +0,0 @@
-{
-  "currentRound":48,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":454
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":455
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":449
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":450
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":451
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":452
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":453
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":454
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":455
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":456
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":457
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":458
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":459
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":460
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":461
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":462
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":463
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":464
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":465
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":466
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":467
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":468
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":469
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":470
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":471
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":472
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":473
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":474
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":449
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":450
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":451
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":452
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":453
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":454
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":455
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":456
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":457
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":458
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":459
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":460
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":461
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":462
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":463
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":464
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":465
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":466
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":467
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":468
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":469
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":470
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":471
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":472
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":473
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":474
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":449
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":450
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":451
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":452
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":453
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":454
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":455
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":3,
-          "x":456
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":457
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":458
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":459
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":460
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":461
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":462
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":463
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":464
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":465
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":466
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":467
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":468
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":469
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":470
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":471
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":472
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":473
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":474
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":449
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":450
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":451
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":452
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":453
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":454
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":455
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":456
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":457
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":458
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":459
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":460
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":461
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":462
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":463
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":464
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":465
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":466
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":467
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":468
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":469
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":470
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":471
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":472
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":473
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":474
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 048/OpponentCommand.txt b/tests/v1-normal-match/Round 048/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 048/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 048/PlayerCommand.txt b/tests/v1-normal-match/Round 048/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 048/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 049/JsonMap.json b/tests/v1-normal-match/Round 049/JsonMap.json
deleted file mode 100644
index 1681e8b..0000000
--- a/tests/v1-normal-match/Round 049/JsonMap.json
+++ /dev/null
@@ -1,872 +0,0 @@
-{
-  "currentRound":49,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":463
-    },
-    "speed":9,
-    "state":"ACCELERATING",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":464
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":458
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":459
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":460
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":461
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":462
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":463
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":464
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":465
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":466
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":467
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":468
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":469
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":470
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":471
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":472
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":473
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":474
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":475
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":476
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":477
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":478
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":479
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":480
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":481
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":482
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":483
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":458
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":459
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":460
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":461
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":462
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":463
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":464
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":465
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":466
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":467
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":468
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":469
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":470
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":471
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":472
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":473
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":474
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":475
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":476
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":477
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":478
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":479
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":480
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":481
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":482
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":483
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":458
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":459
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":460
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":461
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":462
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":463
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":464
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":3,
-          "x":465
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":466
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":467
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":468
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":469
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":470
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":471
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":472
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":473
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":474
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":475
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":476
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":477
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":478
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":479
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":480
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":481
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":482
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":483
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":458
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":459
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":460
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":461
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":462
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":463
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":464
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":465
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":466
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":467
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":468
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":469
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":470
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":471
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":472
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":473
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":474
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":475
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":476
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":477
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":478
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":479
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":480
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":481
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":482
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":483
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 049/OpponentCommand.txt b/tests/v1-normal-match/Round 049/OpponentCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 049/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 049/PlayerCommand.txt b/tests/v1-normal-match/Round 049/PlayerCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 049/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 050/JsonMap.json b/tests/v1-normal-match/Round 050/JsonMap.json
deleted file mode 100644
index 96e7e9c..0000000
--- a/tests/v1-normal-match/Round 050/JsonMap.json
+++ /dev/null
@@ -1,873 +0,0 @@
-{
-  "currentRound":50,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":471
-    },
-    "speed":9,
-    "state":"TURNING_LEFT",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":472
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":466
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":467
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":468
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":469
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":470
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":471
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":472
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":473
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":474
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":475
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":476
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":477
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":478
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":479
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":480
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":481
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":482
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":483
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":484
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":485
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":486
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":488
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":489
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":490
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":491
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":466
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":467
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":468
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":469
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":470
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":471
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":472
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":2,
-          "x":473
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":474
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":475
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":476
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":477
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":478
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":479
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":480
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":481
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":482
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":483
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":484
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":485
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":486
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":488
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":489
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":490
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":491
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":466
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":467
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":468
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":469
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":470
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":471
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":472
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":473
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":474
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":475
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":476
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":477
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":478
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":479
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":480
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":481
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":482
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":483
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":484
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":485
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":486
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":488
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":489
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":490
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":491
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":466
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":467
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":468
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":469
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":470
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":471
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":472
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":473
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":474
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":475
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":476
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":477
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":478
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":479
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":480
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":481
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":482
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":483
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":484
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":485
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":486
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":488
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":489
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":490
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":491
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 050/OpponentCommand.txt b/tests/v1-normal-match/Round 050/OpponentCommand.txt
deleted file mode 100644
index 1baaf21..0000000
--- a/tests/v1-normal-match/Round 050/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: NOTHING
diff --git a/tests/v1-normal-match/Round 050/PlayerCommand.txt b/tests/v1-normal-match/Round 050/PlayerCommand.txt
deleted file mode 100644
index 47076cf..0000000
--- a/tests/v1-normal-match/Round 050/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_RIGHT
diff --git a/tests/v1-normal-match/Round 051/JsonMap.json b/tests/v1-normal-match/Round 051/JsonMap.json
deleted file mode 100644
index f52298a..0000000
--- a/tests/v1-normal-match/Round 051/JsonMap.json
+++ /dev/null
@@ -1,873 +0,0 @@
-{
-  "currentRound":51,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":479
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":481
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":474
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":475
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":476
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":477
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":478
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":479
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":480
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":481
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":482
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":483
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":484
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":485
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":486
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":488
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":489
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":490
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":491
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":492
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":493
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":494
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":495
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":496
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":497
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":474
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":475
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":476
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":477
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":478
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":479
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":480
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":481
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":2,
-          "x":482
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":483
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":484
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":485
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":486
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":488
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":489
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":490
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":491
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":492
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":493
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":494
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":495
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":496
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":497
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":474
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":475
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":476
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":477
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":478
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":479
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":480
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":481
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":482
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":483
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":484
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":485
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":486
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":488
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":489
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":490
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":491
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":492
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":493
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":494
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":495
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":496
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":497
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":474
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":475
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":476
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":477
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":478
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":479
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":480
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":481
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":482
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":483
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":484
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":485
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":486
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":488
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":489
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":490
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":491
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":492
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":493
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":494
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":495
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":496
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":497
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 051/OpponentCommand.txt b/tests/v1-normal-match/Round 051/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 051/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 051/PlayerCommand.txt b/tests/v1-normal-match/Round 051/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 051/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 052/JsonMap.json b/tests/v1-normal-match/Round 052/JsonMap.json
deleted file mode 100644
index ef45b3c..0000000
--- a/tests/v1-normal-match/Round 052/JsonMap.json
+++ /dev/null
@@ -1,873 +0,0 @@
-{
-  "currentRound":52,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":488
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":496
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":483
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":484
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":485
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":486
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":488
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":489
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":490
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":491
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":492
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":493
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":494
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":495
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":496
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":497
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":500
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":501
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":502
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":503
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":504
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":505
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":506
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":507
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":508
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":483
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":484
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":485
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":486
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":488
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":489
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":490
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":491
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":492
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":493
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":494
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":495
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":496
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":2,
-          "x":497
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":500
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":501
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":502
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":503
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":504
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":505
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":506
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":507
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":508
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":483
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":484
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":485
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":486
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":488
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":489
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":490
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":491
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":492
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":493
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":494
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":495
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":496
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":497
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":500
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":501
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":502
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":503
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":504
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":505
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":506
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":507
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":508
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":483
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":484
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":485
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":486
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":488
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":489
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":490
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":491
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":492
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":493
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":494
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":495
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":496
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":497
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":500
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":501
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":502
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":503
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":504
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":505
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":506
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":507
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":508
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 052/OpponentCommand.txt b/tests/v1-normal-match/Round 052/OpponentCommand.txt
deleted file mode 100644
index 1baaf21..0000000
--- a/tests/v1-normal-match/Round 052/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: NOTHING
diff --git a/tests/v1-normal-match/Round 052/PlayerCommand.txt b/tests/v1-normal-match/Round 052/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 052/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 053/JsonMap.json b/tests/v1-normal-match/Round 053/JsonMap.json
deleted file mode 100644
index 96941de..0000000
--- a/tests/v1-normal-match/Round 053/JsonMap.json
+++ /dev/null
@@ -1,872 +0,0 @@
-{
-  "currentRound":53,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":503
-    },
-    "speed":15,
-    "state":"USED_BOOST",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":true,
-    "boostCounter":5
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":505
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":500
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":501
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":502
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":503
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":504
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":505
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":506
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":507
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":508
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":509
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":510
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":511
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":512
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":513
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":514
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":515
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":516
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":517
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":518
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":519
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":520
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":521
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":522
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":523
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":500
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":501
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":502
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":503
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":504
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":505
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":2,
-          "x":506
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":507
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":508
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":509
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":510
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":511
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":512
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":513
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":514
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":515
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":516
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":517
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":518
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":519
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":520
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":521
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":522
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":523
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":500
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":501
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":502
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":503
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":504
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":505
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":506
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":507
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":508
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":509
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":510
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":511
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":512
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":513
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":514
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":515
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":516
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":517
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":518
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":519
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":520
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":521
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":522
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":523
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":500
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":501
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":502
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":503
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":504
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":505
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":506
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":507
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":508
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":509
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":510
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":511
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":512
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":513
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":514
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":515
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":516
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":517
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":518
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":519
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":520
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":521
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":522
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":523
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 053/OpponentCommand.txt b/tests/v1-normal-match/Round 053/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 053/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 053/PlayerCommand.txt b/tests/v1-normal-match/Round 053/PlayerCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 053/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 054/JsonMap.json b/tests/v1-normal-match/Round 054/JsonMap.json
deleted file mode 100644
index 9d355ee..0000000
--- a/tests/v1-normal-match/Round 054/JsonMap.json
+++ /dev/null
@@ -1,871 +0,0 @@
-{
-  "currentRound":54,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":518
-    },
-    "speed":15,
-    "state":"USED_OIL",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":true,
-    "boostCounter":4
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":514
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":513
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":514
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":515
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":516
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":517
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":518
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":519
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":520
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":521
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":522
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":523
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":524
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":525
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":526
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":527
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":528
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":529
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":530
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":531
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":532
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":533
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":534
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":535
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":536
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":537
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":538
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":513
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":514
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":2
-      },
-      {
-        "position":{
-          "y":2,
-          "x":515
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":516
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":517
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":518
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":519
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":520
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":521
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":522
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":523
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":524
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":525
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":526
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":527
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":528
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":529
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":530
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":531
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":532
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":533
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":534
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":535
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":536
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":537
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":538
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":513
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":514
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":515
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":516
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":517
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":518
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":519
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":520
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":521
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":522
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":523
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":524
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":525
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":526
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":527
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":528
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":529
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":530
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":531
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":532
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":533
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":534
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":535
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":536
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":537
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":538
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":513
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":514
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":515
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":516
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":517
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":518
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":519
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":520
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":521
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":522
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":523
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":524
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":525
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":526
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":527
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":528
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":529
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":530
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":531
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":532
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":533
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":534
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":535
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":536
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":537
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":538
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 054/OpponentCommand.txt b/tests/v1-normal-match/Round 054/OpponentCommand.txt
deleted file mode 100644
index 1baaf21..0000000
--- a/tests/v1-normal-match/Round 054/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: NOTHING
diff --git a/tests/v1-normal-match/Round 054/PlayerCommand.txt b/tests/v1-normal-match/Round 054/PlayerCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 054/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 055/JsonMap.json b/tests/v1-normal-match/Round 055/JsonMap.json
deleted file mode 100644
index 5c75be8..0000000
--- a/tests/v1-normal-match/Round 055/JsonMap.json
+++ /dev/null
@@ -1,873 +0,0 @@
-{
-  "currentRound":55,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":533
-    },
-    "speed":9,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":523
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":528
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":529
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":530
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":531
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":532
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":533
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":534
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":535
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":536
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":537
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":538
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":539
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":540
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":541
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":542
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":543
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":544
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":545
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":546
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":547
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":548
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":549
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":550
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":551
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":552
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":553
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":528
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":529
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":530
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":531
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":532
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":533
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":534
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":535
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":536
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":537
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":538
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":539
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":540
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":541
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":542
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":543
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":544
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":545
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":546
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":547
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":548
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":549
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":550
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":551
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":552
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":553
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":528
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":529
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":530
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":531
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":532
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":533
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":534
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":535
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":536
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":537
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":538
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":539
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":540
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":541
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":542
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":543
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":544
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":545
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":546
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":547
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":548
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":549
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":550
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":551
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":552
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":553
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":528
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":529
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":530
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":531
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":532
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":533
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":534
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":535
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":536
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":537
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":538
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":539
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":540
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":541
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":542
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":543
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":544
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":545
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":546
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":547
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":548
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":549
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":550
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":551
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":552
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":553
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 055/OpponentCommand.txt b/tests/v1-normal-match/Round 055/OpponentCommand.txt
deleted file mode 100644
index 47076cf..0000000
--- a/tests/v1-normal-match/Round 055/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_RIGHT
diff --git a/tests/v1-normal-match/Round 055/PlayerCommand.txt b/tests/v1-normal-match/Round 055/PlayerCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 055/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 056/JsonMap.json b/tests/v1-normal-match/Round 056/JsonMap.json
deleted file mode 100644
index 355f9a5..0000000
--- a/tests/v1-normal-match/Round 056/JsonMap.json
+++ /dev/null
@@ -1,872 +0,0 @@
-{
-  "currentRound":56,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":542
-    },
-    "speed":9,
-    "state":"USED_OIL",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":530
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":537
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":538
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":539
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":540
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":541
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":542
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":543
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":544
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":545
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":546
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":547
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":548
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":549
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":550
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":551
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":552
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":553
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":554
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":555
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":556
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":557
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":558
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":559
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":560
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":561
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":562
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":537
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":538
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":539
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":540
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":541
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":542
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":543
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":544
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":545
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":546
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":547
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":548
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":549
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":550
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":551
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":552
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":553
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":554
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":555
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":556
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":557
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":558
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":559
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":560
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":561
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":562
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":537
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":538
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":539
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":540
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":541
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":542
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":543
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":544
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":545
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":546
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":547
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":548
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":549
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":550
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":551
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":552
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":553
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":554
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":555
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":556
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":557
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":558
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":559
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":560
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":561
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":562
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":537
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":538
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":539
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":540
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":541
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":542
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":543
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":544
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":545
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":546
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":547
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":548
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":549
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":550
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":551
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":552
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":553
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":554
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":555
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":556
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":557
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":558
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":559
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":560
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":561
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":562
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 056/OpponentCommand.txt b/tests/v1-normal-match/Round 056/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 056/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 056/PlayerCommand.txt b/tests/v1-normal-match/Round 056/PlayerCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 056/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 057/JsonMap.json b/tests/v1-normal-match/Round 057/JsonMap.json
deleted file mode 100644
index 6c9ac45..0000000
--- a/tests/v1-normal-match/Round 057/JsonMap.json
+++ /dev/null
@@ -1,871 +0,0 @@
-{
-  "currentRound":57,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":551
-    },
-    "speed":6,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":539
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":546
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":547
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":548
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":549
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":550
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":551
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":552
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":553
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":554
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":555
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":556
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":557
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":558
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":559
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":560
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":561
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":562
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":563
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":564
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":565
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":566
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":567
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":568
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":569
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":570
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":571
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":546
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":547
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":548
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":549
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":550
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":551
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":552
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":553
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":554
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":555
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":556
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":557
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":558
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":559
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":560
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":561
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":562
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":563
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":564
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":565
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":566
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":567
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":568
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":569
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":570
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":571
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":546
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":547
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":548
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":549
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":550
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":551
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":552
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":553
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":554
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":555
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":556
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":557
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":558
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":559
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":560
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":561
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":562
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":563
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":564
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":565
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":566
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":567
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":568
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":569
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":570
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":571
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":546
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":547
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":548
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":549
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":550
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":551
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":552
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":553
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":554
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":555
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":556
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":557
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":558
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":559
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":560
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":561
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":562
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":563
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":564
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":565
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":566
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":567
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":568
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":569
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":570
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":571
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 057/OpponentCommand.txt b/tests/v1-normal-match/Round 057/OpponentCommand.txt
deleted file mode 100644
index 1baaf21..0000000
--- a/tests/v1-normal-match/Round 057/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: NOTHING
diff --git a/tests/v1-normal-match/Round 057/PlayerCommand.txt b/tests/v1-normal-match/Round 057/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 057/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 058/JsonMap.json b/tests/v1-normal-match/Round 058/JsonMap.json
deleted file mode 100644
index 289391d..0000000
--- a/tests/v1-normal-match/Round 058/JsonMap.json
+++ /dev/null
@@ -1,871 +0,0 @@
-{
-  "currentRound":58,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":559
-    },
-    "speed":3,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":547
-    },
-    "speed":3
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":554
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":555
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":556
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":557
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":558
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":559
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":560
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":561
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":562
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":563
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":564
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":565
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":566
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":567
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":568
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":569
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":570
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":571
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":572
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":573
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":574
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":575
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":576
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":577
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":578
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":579
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":554
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":555
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":556
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":557
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":558
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":559
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":560
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":561
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":562
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":563
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":564
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":565
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":566
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":567
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":568
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":569
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":570
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":571
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":572
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":573
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":574
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":575
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":576
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":577
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":578
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":579
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":554
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":555
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":556
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":557
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":558
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":559
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":560
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":561
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":562
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":563
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":564
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":565
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":566
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":567
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":568
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":569
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":570
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":571
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":572
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":573
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":574
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":575
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":576
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":577
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":578
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":579
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":554
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":555
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":556
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":557
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":558
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":559
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":560
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":561
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":562
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":563
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":564
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":565
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":566
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":567
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":568
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":569
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":570
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":571
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":572
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":573
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":574
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":575
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":576
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":577
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":578
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":579
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 058/OpponentCommand.txt b/tests/v1-normal-match/Round 058/OpponentCommand.txt
deleted file mode 100644
index 1baaf21..0000000
--- a/tests/v1-normal-match/Round 058/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: NOTHING
diff --git a/tests/v1-normal-match/Round 058/PlayerCommand.txt b/tests/v1-normal-match/Round 058/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 058/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 059/JsonMap.json b/tests/v1-normal-match/Round 059/JsonMap.json
deleted file mode 100644
index 6ac1ba9..0000000
--- a/tests/v1-normal-match/Round 059/JsonMap.json
+++ /dev/null
@@ -1,871 +0,0 @@
-{
-  "currentRound":59,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":565
-    },
-    "speed":3,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":550
-    },
-    "speed":3
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":560
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":561
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":562
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":563
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":564
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":565
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":566
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":567
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":568
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":569
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":570
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":571
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":572
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":573
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":574
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":575
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":576
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":577
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":578
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":579
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":580
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":581
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":582
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":583
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":584
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":585
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":560
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":561
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":562
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":563
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":564
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":565
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":566
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":567
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":568
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":569
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":570
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":571
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":572
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":573
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":574
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":575
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":576
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":577
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":578
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":579
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":580
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":581
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":582
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":583
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":584
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":585
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":560
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":561
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":562
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":563
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":564
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":565
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":566
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":567
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":568
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":569
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":570
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":571
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":572
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":573
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":574
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":575
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":576
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":577
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":578
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":579
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":580
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":581
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":582
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":583
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":584
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":585
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":560
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":561
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":562
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":563
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":564
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":565
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":566
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":567
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":568
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":569
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":570
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":571
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":572
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":573
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":574
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":575
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":576
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":577
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":578
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":579
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":580
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":581
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":582
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":583
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":584
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":585
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 059/OpponentCommand.txt b/tests/v1-normal-match/Round 059/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 059/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 059/PlayerCommand.txt b/tests/v1-normal-match/Round 059/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 059/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 060/JsonMap.json b/tests/v1-normal-match/Round 060/JsonMap.json
deleted file mode 100644
index c0cd3e8..0000000
--- a/tests/v1-normal-match/Round 060/JsonMap.json
+++ /dev/null
@@ -1,870 +0,0 @@
-{
-  "currentRound":60,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":580
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":556
-    },
-    "speed":3
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":575
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":576
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":577
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":578
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":579
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":580
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":581
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":582
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":583
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":584
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":585
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":586
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":587
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":588
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":589
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":590
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":591
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":592
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":593
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":594
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":595
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":596
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":597
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":598
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":599
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":600
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":575
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":576
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":577
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":578
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":579
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":580
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":581
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":582
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":583
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":584
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":585
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":586
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":587
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":588
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":589
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":590
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":591
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":592
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":593
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":594
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":595
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":596
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":597
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":598
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":599
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":600
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":575
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":576
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":577
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":578
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":579
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":580
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":581
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":582
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":583
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":584
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":585
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":586
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":587
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":588
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":589
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":590
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":591
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":592
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":593
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":594
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":595
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":596
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":597
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":598
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":599
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":600
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":575
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":576
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":577
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":578
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":579
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":580
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":581
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":582
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":583
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":584
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":585
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":586
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":587
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":588
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":589
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":590
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":591
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":592
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":593
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":594
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":595
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":596
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":597
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":598
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":599
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":600
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 060/OpponentCommand.txt b/tests/v1-normal-match/Round 060/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 060/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 060/PlayerCommand.txt b/tests/v1-normal-match/Round 060/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 060/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 061/JsonMap.json b/tests/v1-normal-match/Round 061/JsonMap.json
deleted file mode 100644
index 41d22df..0000000
--- a/tests/v1-normal-match/Round 061/JsonMap.json
+++ /dev/null
@@ -1,870 +0,0 @@
-{
-  "currentRound":61,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":589
-    },
-    "speed":6,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":562
-    },
-    "speed":3
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":584
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":585
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":586
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":587
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":588
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":589
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":590
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":591
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":592
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":593
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":594
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":595
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":596
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":597
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":598
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":599
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":600
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":601
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":602
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":603
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":604
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":605
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":606
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":607
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":608
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":609
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":584
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":585
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":586
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":587
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":588
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":589
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":590
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":591
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":592
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":593
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":594
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":595
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":596
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":597
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":598
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":599
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":600
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":601
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":602
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":603
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":604
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":605
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":606
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":607
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":608
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":609
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":584
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":585
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":586
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":587
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":588
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":589
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":590
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":591
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":592
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":593
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":594
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":595
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":596
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":597
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":598
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":599
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":600
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":601
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":602
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":603
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":604
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":605
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":606
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":607
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":608
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":609
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":584
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":585
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":586
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":587
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":588
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":589
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":590
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":591
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":592
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":593
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":594
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":595
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":596
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":597
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":598
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":599
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":600
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":601
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":602
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":603
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":604
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":605
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":606
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":607
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":608
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":609
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 061/OpponentCommand.txt b/tests/v1-normal-match/Round 061/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 061/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 061/PlayerCommand.txt b/tests/v1-normal-match/Round 061/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 061/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 062/JsonMap.json b/tests/v1-normal-match/Round 062/JsonMap.json
deleted file mode 100644
index 8a8fde5..0000000
--- a/tests/v1-normal-match/Round 062/JsonMap.json
+++ /dev/null
@@ -1,870 +0,0 @@
-{
-  "currentRound":62,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":597
-    },
-    "speed":6,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":568
-    },
-    "speed":3
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":592
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":593
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":594
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":595
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":596
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":597
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":598
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":599
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":600
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":601
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":602
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":603
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":604
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":605
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":606
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":607
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":608
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":609
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":610
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":611
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":612
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":613
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":614
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":615
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":616
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":617
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":592
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":593
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":594
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":595
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":596
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":597
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":598
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":599
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":600
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":601
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":602
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":603
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":604
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":605
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":606
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":607
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":608
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":609
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":610
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":611
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":612
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":613
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":614
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":615
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":616
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":617
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":592
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":593
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":594
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":595
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":596
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":597
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":598
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":599
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":600
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":601
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":602
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":603
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":604
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":605
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":606
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":607
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":608
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":609
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":610
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":611
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":612
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":613
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":614
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":615
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":616
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":617
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":592
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":593
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":594
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":595
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":596
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":597
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":598
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":599
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":600
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":601
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":602
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":603
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":604
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":605
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":606
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":607
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":608
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":609
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":610
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":611
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":612
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":613
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":614
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":615
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":616
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":617
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 062/OpponentCommand.txt b/tests/v1-normal-match/Round 062/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 062/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 062/PlayerCommand.txt b/tests/v1-normal-match/Round 062/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 062/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 063/JsonMap.json b/tests/v1-normal-match/Round 063/JsonMap.json
deleted file mode 100644
index f0a75d1..0000000
--- a/tests/v1-normal-match/Round 063/JsonMap.json
+++ /dev/null
@@ -1,870 +0,0 @@
-{
-  "currentRound":63,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":605
-    },
-    "speed":6,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":574
-    },
-    "speed":3
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":600
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":601
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":602
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":603
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":604
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":605
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":606
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":607
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":608
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":609
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":610
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":611
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":612
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":613
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":614
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":615
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":616
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":617
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":618
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":619
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":620
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":621
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":622
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":623
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":624
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":625
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":600
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":601
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":602
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":603
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":604
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":605
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":606
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":607
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":608
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":609
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":610
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":611
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":612
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":613
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":614
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":615
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":616
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":617
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":618
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":619
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":620
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":621
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":622
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":623
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":624
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":625
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":600
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":601
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":602
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":603
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":604
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":605
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":606
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":607
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":608
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":609
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":610
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":611
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":612
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":613
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":614
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":615
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":616
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":617
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":618
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":619
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":620
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":621
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":622
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":623
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":624
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":625
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":600
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":601
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":602
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":603
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":604
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":605
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":606
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":607
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":608
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":609
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":610
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":611
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":612
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":613
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":614
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":615
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":616
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":617
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":618
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":619
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":620
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":621
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":622
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":623
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":624
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":625
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 063/OpponentCommand.txt b/tests/v1-normal-match/Round 063/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 063/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 063/PlayerCommand.txt b/tests/v1-normal-match/Round 063/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 063/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 064/JsonMap.json b/tests/v1-normal-match/Round 064/JsonMap.json
deleted file mode 100644
index 5605326..0000000
--- a/tests/v1-normal-match/Round 064/JsonMap.json
+++ /dev/null
@@ -1,870 +0,0 @@
-{
-  "currentRound":64,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":613
-    },
-    "speed":3,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":580
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":608
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":609
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":610
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":611
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":612
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":613
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":614
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":615
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":616
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":617
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":618
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":619
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":620
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":621
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":622
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":623
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":624
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":625
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":626
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":627
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":628
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":629
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":630
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":631
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":632
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":633
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":608
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":609
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":610
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":611
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":612
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":613
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":614
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":615
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":616
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":617
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":618
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":619
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":620
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":621
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":622
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":623
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":624
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":625
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":626
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":627
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":628
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":629
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":630
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":631
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":632
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":633
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":608
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":609
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":610
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":611
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":612
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":613
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":614
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":615
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":616
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":617
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":618
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":619
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":620
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":621
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":622
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":623
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":624
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":625
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":626
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":627
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":628
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":629
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":630
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":631
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":632
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":633
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":608
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":609
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":610
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":611
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":612
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":613
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":614
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":615
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":616
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":617
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":618
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":619
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":620
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":621
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":622
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":623
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":624
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":625
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":626
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":627
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":628
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":629
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":630
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":631
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":632
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":633
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 064/OpponentCommand.txt b/tests/v1-normal-match/Round 064/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 064/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 064/PlayerCommand.txt b/tests/v1-normal-match/Round 064/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 064/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 065/JsonMap.json b/tests/v1-normal-match/Round 065/JsonMap.json
deleted file mode 100644
index 6ecf1e9..0000000
--- a/tests/v1-normal-match/Round 065/JsonMap.json
+++ /dev/null
@@ -1,871 +0,0 @@
-{
-  "currentRound":65,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":619
-    },
-    "speed":3,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":588
-    },
-    "speed":3
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":614
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":615
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":616
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":617
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":618
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":619
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":620
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":621
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":622
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":623
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":624
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":625
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":626
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":627
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":628
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":629
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":630
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":631
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":632
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":633
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":634
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":635
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":636
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":637
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":638
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":639
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":614
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":615
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":616
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":617
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":618
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":619
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":620
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":621
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":622
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":623
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":624
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":625
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":626
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":627
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":628
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":629
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":630
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":631
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":632
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":633
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":634
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":635
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":636
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":637
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":638
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":639
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":614
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":615
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":616
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":617
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":618
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":619
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":620
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":621
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":622
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":623
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":624
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":625
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":626
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":627
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":628
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":629
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":630
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":631
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":632
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":633
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":634
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":635
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":636
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":637
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":638
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":639
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":614
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":615
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":616
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":617
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":618
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":619
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":620
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":621
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":622
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":623
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":624
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":625
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":626
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":627
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":628
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":629
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":630
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":631
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":632
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":633
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":634
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":635
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":636
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":637
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":638
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":639
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 065/OpponentCommand.txt b/tests/v1-normal-match/Round 065/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 065/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 065/PlayerCommand.txt b/tests/v1-normal-match/Round 065/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 065/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 066/JsonMap.json b/tests/v1-normal-match/Round 066/JsonMap.json
deleted file mode 100644
index 39b1aa8..0000000
--- a/tests/v1-normal-match/Round 066/JsonMap.json
+++ /dev/null
@@ -1,871 +0,0 @@
-{
-  "currentRound":66,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":625
-    },
-    "speed":6,
-    "state":"ACCELERATING",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":594
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":620
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":621
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":622
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":623
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":624
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":625
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":626
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":627
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":628
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":629
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":630
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":631
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":632
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":633
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":634
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":635
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":636
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":637
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":638
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":639
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":640
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":641
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":642
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":643
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":644
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":645
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":620
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":621
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":622
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":623
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":624
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":625
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":626
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":627
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":628
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":629
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":630
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":631
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":632
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":633
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":634
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":635
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":636
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":637
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":638
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":639
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":640
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":641
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":642
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":643
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":644
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":645
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":620
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":621
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":622
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":623
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":624
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":625
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":626
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":627
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":628
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":629
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":630
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":631
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":632
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":633
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":634
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":635
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":636
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":637
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":638
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":639
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":640
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":641
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":642
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":643
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":644
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":645
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":620
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":621
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":622
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":623
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":624
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":625
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":626
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":627
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":628
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":629
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":630
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":631
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":632
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":633
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":634
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":635
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":636
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":637
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":638
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":639
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":640
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":641
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":642
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":643
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":644
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":645
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 066/OpponentCommand.txt b/tests/v1-normal-match/Round 066/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 066/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 066/PlayerCommand.txt b/tests/v1-normal-match/Round 066/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 066/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 067/JsonMap.json b/tests/v1-normal-match/Round 067/JsonMap.json
deleted file mode 100644
index 699f3f0..0000000
--- a/tests/v1-normal-match/Round 067/JsonMap.json
+++ /dev/null
@@ -1,871 +0,0 @@
-{
-  "currentRound":67,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":633
-    },
-    "speed":6,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":602
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":628
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":629
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":630
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":631
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":632
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":633
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":634
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":635
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":636
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":637
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":638
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":639
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":640
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":641
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":642
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":643
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":644
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":645
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":646
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":647
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":648
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":649
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":650
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":651
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":652
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":653
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":628
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":629
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":630
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":631
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":632
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":633
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":634
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":635
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":636
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":637
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":638
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":639
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":640
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":641
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":642
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":643
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":644
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":645
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":646
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":647
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":648
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":649
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":650
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":651
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":652
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":653
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":628
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":629
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":630
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":631
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":632
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":633
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":634
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":635
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":636
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":637
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":638
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":639
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":640
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":641
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":642
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":643
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":644
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":645
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":646
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":647
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":648
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":649
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":650
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":651
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":652
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":653
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":628
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":629
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":630
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":631
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":632
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":633
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":634
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":635
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":636
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":637
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":638
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":639
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":640
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":641
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":642
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":643
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":644
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":645
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":646
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":647
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":648
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":649
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":650
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":651
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":652
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":653
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 067/OpponentCommand.txt b/tests/v1-normal-match/Round 067/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 067/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 067/PlayerCommand.txt b/tests/v1-normal-match/Round 067/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 067/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 068/JsonMap.json b/tests/v1-normal-match/Round 068/JsonMap.json
deleted file mode 100644
index efcd4f8..0000000
--- a/tests/v1-normal-match/Round 068/JsonMap.json
+++ /dev/null
@@ -1,871 +0,0 @@
-{
-  "currentRound":68,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":641
-    },
-    "speed":8,
-    "state":"ACCELERATING",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":610
-    },
-    "speed":3
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":636
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":637
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":638
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":639
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":640
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":641
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":642
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":643
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":644
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":645
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":646
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":647
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":648
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":649
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":650
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":651
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":652
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":653
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":654
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":655
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":656
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":657
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":658
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":659
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":660
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":661
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":636
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":637
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":638
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":639
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":640
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":641
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":642
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":643
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":644
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":645
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":646
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":647
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":648
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":649
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":650
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":651
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":652
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":653
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":654
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":655
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":656
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":657
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":658
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":659
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":660
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":661
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":636
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":637
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":638
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":639
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":640
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":641
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":642
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":643
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":644
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":645
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":646
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":647
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":648
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":649
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":650
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":651
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":652
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":653
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":654
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":655
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":656
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":657
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":658
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":659
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":660
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":661
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":636
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":637
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":638
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":639
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":640
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":641
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":642
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":643
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":644
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":645
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":646
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":647
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":648
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":649
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":650
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":651
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":652
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":653
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":654
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":655
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":656
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":657
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":658
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":659
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":660
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":661
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 068/OpponentCommand.txt b/tests/v1-normal-match/Round 068/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 068/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 068/PlayerCommand.txt b/tests/v1-normal-match/Round 068/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 068/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 069/JsonMap.json b/tests/v1-normal-match/Round 069/JsonMap.json
deleted file mode 100644
index cf22817..0000000
--- a/tests/v1-normal-match/Round 069/JsonMap.json
+++ /dev/null
@@ -1,871 +0,0 @@
-{
-  "currentRound":69,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":650
-    },
-    "speed":9,
-    "state":"ACCELERATING",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":616
-    },
-    "speed":3
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":645
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":646
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":647
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":648
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":649
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":650
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":651
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":652
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":653
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":654
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":655
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":656
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":657
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":658
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":659
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":660
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":661
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":662
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":663
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":664
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":665
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":666
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":667
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":668
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":669
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":670
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":645
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":646
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":647
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":648
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":649
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":650
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":651
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":652
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":653
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":654
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":655
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":656
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":657
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":658
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":659
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":660
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":661
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":662
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":663
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":664
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":665
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":666
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":667
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":668
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":669
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":670
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":645
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":646
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":647
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":648
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":649
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":650
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":651
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":652
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":653
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":654
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":655
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":656
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":657
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":658
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":659
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":660
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":661
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":662
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":663
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":664
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":665
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":666
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":667
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":668
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":669
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":670
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":645
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":646
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":647
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":648
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":649
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":650
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":651
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":652
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":653
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":654
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":655
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":656
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":657
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":658
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":659
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":660
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":661
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":662
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":663
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":664
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":665
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":666
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":667
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":668
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":669
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":670
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 069/OpponentCommand.txt b/tests/v1-normal-match/Round 069/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 069/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 069/PlayerCommand.txt b/tests/v1-normal-match/Round 069/PlayerCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 069/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 070/JsonMap.json b/tests/v1-normal-match/Round 070/JsonMap.json
deleted file mode 100644
index ca1dfeb..0000000
--- a/tests/v1-normal-match/Round 070/JsonMap.json
+++ /dev/null
@@ -1,871 +0,0 @@
-{
-  "currentRound":70,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":659
-    },
-    "speed":9,
-    "state":"USED_OIL",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":622
-    },
-    "speed":3
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":654
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":655
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":656
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":657
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":658
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":659
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":660
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":661
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":662
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":663
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":664
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":665
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":666
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":667
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":668
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":669
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":670
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":671
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":672
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":673
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":674
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":675
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":676
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":677
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":678
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":679
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":654
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":655
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":656
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":657
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":658
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":659
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":660
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":661
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":662
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":663
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":664
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":665
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":666
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":667
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":668
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":669
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":670
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":671
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":672
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":673
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":674
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":675
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":676
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":677
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":678
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":679
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":654
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":655
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":656
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":657
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":658
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":659
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":660
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":661
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":662
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":663
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":664
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":665
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":666
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":667
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":668
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":669
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":670
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":671
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":672
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":673
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":674
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":675
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":676
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":677
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":678
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":679
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":654
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":655
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":656
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":657
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":658
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":659
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":660
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":661
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":662
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":663
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":664
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":665
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":666
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":667
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":668
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":669
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":670
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":671
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":672
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":673
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":674
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":675
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":676
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":677
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":678
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":679
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 070/OpponentCommand.txt b/tests/v1-normal-match/Round 070/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 070/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 070/PlayerCommand.txt b/tests/v1-normal-match/Round 070/PlayerCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 070/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 071/JsonMap.json b/tests/v1-normal-match/Round 071/JsonMap.json
deleted file mode 100644
index 390858b..0000000
--- a/tests/v1-normal-match/Round 071/JsonMap.json
+++ /dev/null
@@ -1,870 +0,0 @@
-{
-  "currentRound":71,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":668
-    },
-    "speed":9,
-    "state":"USED_OIL",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":628
-    },
-    "speed":3
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":663
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":664
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":665
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":666
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":667
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":668
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":669
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":670
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":671
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":672
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":673
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":674
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":675
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":676
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":677
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":678
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":679
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":680
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":681
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":682
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":683
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":684
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":685
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":686
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":687
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":688
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":663
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":664
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":665
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":666
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":667
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":668
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":669
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":670
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":671
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":672
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":673
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":674
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":675
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":676
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":677
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":678
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":679
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":680
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":681
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":682
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":683
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":684
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":685
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":686
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":687
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":688
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":663
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":664
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":665
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":666
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":667
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":668
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":669
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":670
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":671
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":672
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":673
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":674
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":675
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":676
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":677
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":678
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":679
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":680
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":681
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":682
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":683
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":684
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":685
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":686
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":687
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":688
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":663
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":664
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":665
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":666
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":667
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":668
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":669
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":670
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":671
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":672
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":673
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":674
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":675
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":676
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":677
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":678
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":679
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":680
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":681
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":682
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":683
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":684
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":685
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":686
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":687
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":688
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 071/OpponentCommand.txt b/tests/v1-normal-match/Round 071/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 071/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 071/PlayerCommand.txt b/tests/v1-normal-match/Round 071/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 071/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 072/JsonMap.json b/tests/v1-normal-match/Round 072/JsonMap.json
deleted file mode 100644
index bfb851c..0000000
--- a/tests/v1-normal-match/Round 072/JsonMap.json
+++ /dev/null
@@ -1,871 +0,0 @@
-{
-  "currentRound":72,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":683
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "BOOST",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":634
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":678
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":679
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":680
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":681
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":682
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":683
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":684
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":685
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":686
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":687
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":688
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":689
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":690
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":691
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":692
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":693
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":694
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":695
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":696
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":697
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":698
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":699
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":700
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":701
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":702
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":703
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":678
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":679
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":680
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":681
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":682
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":683
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":684
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":685
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":686
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":687
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":688
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":689
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":690
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":691
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":692
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":693
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":694
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":695
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":696
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":697
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":698
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":699
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":700
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":701
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":702
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":703
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":678
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":679
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":680
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":681
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":682
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":683
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":684
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":685
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":686
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":687
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":688
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":689
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":690
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":691
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":692
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":693
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":694
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":695
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":696
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":697
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":698
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":699
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":700
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":701
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":702
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":703
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":678
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":679
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":680
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":681
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":682
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":683
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":684
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":685
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":686
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":687
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":688
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":689
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":690
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":691
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":692
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":693
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":694
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":695
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":696
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":697
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":698
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":699
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":700
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":701
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":702
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":703
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 072/OpponentCommand.txt b/tests/v1-normal-match/Round 072/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 072/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 072/PlayerCommand.txt b/tests/v1-normal-match/Round 072/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 072/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 073/JsonMap.json b/tests/v1-normal-match/Round 073/JsonMap.json
deleted file mode 100644
index 44e2b1f..0000000
--- a/tests/v1-normal-match/Round 073/JsonMap.json
+++ /dev/null
@@ -1,870 +0,0 @@
-{
-  "currentRound":73,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":698
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":642
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":693
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":694
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":695
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":696
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":697
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":698
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":699
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":700
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":701
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":702
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":703
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":704
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":705
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":706
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":707
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":708
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":709
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":710
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":711
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":712
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":713
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":714
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":715
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":716
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":717
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":718
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":693
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":694
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":695
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":696
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":697
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":698
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":699
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":700
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":701
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":702
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":703
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":704
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":705
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":706
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":707
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":708
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":709
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":710
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":711
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":712
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":713
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":714
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":715
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":716
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":717
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":718
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":693
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":694
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":695
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":696
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":697
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":698
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":699
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":700
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":701
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":702
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":703
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":704
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":705
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":706
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":707
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":708
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":709
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":710
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":711
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":712
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":713
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":714
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":715
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":716
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":717
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":718
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":693
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":694
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":695
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":696
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":697
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":698
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":699
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":700
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":701
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":702
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":703
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":704
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":705
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":706
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":707
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":708
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":709
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":710
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":711
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":712
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":713
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":714
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":715
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":716
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":717
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":718
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 073/OpponentCommand.txt b/tests/v1-normal-match/Round 073/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 073/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 073/PlayerCommand.txt b/tests/v1-normal-match/Round 073/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 073/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 074/JsonMap.json b/tests/v1-normal-match/Round 074/JsonMap.json
deleted file mode 100644
index bd0e4d0..0000000
--- a/tests/v1-normal-match/Round 074/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":74,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":713
-    },
-    "speed":9,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":651
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":708
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":709
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":710
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":711
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":712
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":713
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":714
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":715
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":716
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":717
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":718
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":719
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":720
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":721
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":722
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":723
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":724
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":725
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":726
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":727
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":728
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":729
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":730
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":731
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":732
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":733
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":708
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":709
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":710
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":711
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":712
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":713
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":714
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":715
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":716
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":717
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":718
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":719
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":720
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":721
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":722
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":723
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":724
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":725
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":726
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":727
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":728
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":729
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":730
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":731
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":732
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":733
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":708
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":709
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":710
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":711
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":712
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":713
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":714
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":715
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":716
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":717
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":718
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":719
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":720
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":721
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":722
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":723
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":724
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":725
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":726
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":727
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":728
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":729
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":730
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":731
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":732
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":733
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":708
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":709
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":710
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":711
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":712
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":713
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":714
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":715
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":716
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":717
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":718
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":719
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":720
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":721
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":722
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":723
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":724
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":725
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":726
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":727
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":728
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":729
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":730
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":731
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":732
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":733
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 074/OpponentCommand.txt b/tests/v1-normal-match/Round 074/OpponentCommand.txt
deleted file mode 100644
index 1baaf21..0000000
--- a/tests/v1-normal-match/Round 074/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: NOTHING
diff --git a/tests/v1-normal-match/Round 074/PlayerCommand.txt b/tests/v1-normal-match/Round 074/PlayerCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 074/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 075/JsonMap.json b/tests/v1-normal-match/Round 075/JsonMap.json
deleted file mode 100644
index b9a88b4..0000000
--- a/tests/v1-normal-match/Round 075/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":75,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":722
-    },
-    "speed":9,
-    "state":"USED_OIL",
-    "powerups":[
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":659
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":717
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":718
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":719
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":720
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":721
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":722
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":723
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":724
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":725
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":726
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":727
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":728
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":729
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":730
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":731
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":732
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":733
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":734
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":735
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":736
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":737
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":738
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":739
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":740
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":741
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":742
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":717
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":718
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":719
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":720
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":721
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":722
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":723
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":724
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":725
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":726
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":727
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":728
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":729
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":730
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":731
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":732
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":733
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":734
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":735
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":736
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":737
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":738
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":739
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":740
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":741
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":742
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":717
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":718
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":719
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":720
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":721
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":722
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":723
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":724
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":725
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":726
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":727
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":728
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":729
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":730
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":731
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":732
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":733
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":734
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":735
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":736
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":737
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":738
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":739
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":740
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":741
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":742
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":717
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":718
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":719
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":720
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":721
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":722
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":723
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":724
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":725
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":726
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":727
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":728
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":729
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":730
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":731
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":732
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":733
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":734
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":735
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":736
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":737
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":738
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":739
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":740
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":741
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":742
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 075/OpponentCommand.txt b/tests/v1-normal-match/Round 075/OpponentCommand.txt
deleted file mode 100644
index 1baaf21..0000000
--- a/tests/v1-normal-match/Round 075/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: NOTHING
diff --git a/tests/v1-normal-match/Round 075/PlayerCommand.txt b/tests/v1-normal-match/Round 075/PlayerCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 075/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 076/JsonMap.json b/tests/v1-normal-match/Round 076/JsonMap.json
deleted file mode 100644
index 7e60dc5..0000000
--- a/tests/v1-normal-match/Round 076/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":76,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":731
-    },
-    "speed":9,
-    "state":"USED_OIL",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":665
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":726
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":727
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":728
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":729
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":730
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":731
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":732
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":733
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":734
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":735
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":736
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":737
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":738
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":739
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":740
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":741
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":742
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":743
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":744
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":745
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":746
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":747
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":748
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":749
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":750
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":751
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":726
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":727
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":728
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":729
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":730
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":731
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":732
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":733
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":734
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":735
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":736
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":737
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":738
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":739
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":740
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":741
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":742
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":743
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":744
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":745
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":746
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":747
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":748
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":749
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":750
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":751
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":726
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":727
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":728
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":729
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":730
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":731
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":732
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":733
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":734
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":735
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":736
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":737
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":738
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":739
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":740
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":741
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":742
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":743
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":744
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":745
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":746
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":747
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":748
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":749
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":750
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":751
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":726
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":727
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":728
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":729
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":730
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":731
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":732
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":733
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":734
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":735
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":736
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":737
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":738
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":739
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":740
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":741
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":742
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":743
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":744
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":745
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":746
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":747
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":748
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":749
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":750
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":751
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 076/OpponentCommand.txt b/tests/v1-normal-match/Round 076/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 076/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 076/PlayerCommand.txt b/tests/v1-normal-match/Round 076/PlayerCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 076/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 077/JsonMap.json b/tests/v1-normal-match/Round 077/JsonMap.json
deleted file mode 100644
index 5732760..0000000
--- a/tests/v1-normal-match/Round 077/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":77,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":739
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":680
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":734
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":735
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":736
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":737
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":738
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":739
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":740
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":741
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":742
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":743
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":744
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":745
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":746
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":747
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":748
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":749
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":750
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":751
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":752
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":753
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":754
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":755
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":756
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":757
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":758
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":759
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":734
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":735
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":736
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":737
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":738
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":739
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":740
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":741
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":742
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":743
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":744
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":745
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":746
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":747
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":748
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":749
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":750
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":751
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":752
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":753
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":754
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":755
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":756
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":757
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":758
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":759
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":734
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":735
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":736
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":737
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":738
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":739
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":740
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":741
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":742
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":743
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":744
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":745
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":746
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":747
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":748
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":749
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":750
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":751
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":752
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":753
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":754
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":755
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":756
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":757
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":758
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":759
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":734
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":735
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":736
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":737
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":738
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":739
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":740
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":741
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":742
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":743
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":744
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":745
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":746
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":747
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":748
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":749
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":750
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":751
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":752
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":753
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":754
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":755
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":756
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":757
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":758
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":759
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 077/OpponentCommand.txt b/tests/v1-normal-match/Round 077/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 077/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 077/PlayerCommand.txt b/tests/v1-normal-match/Round 077/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 077/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 078/JsonMap.json b/tests/v1-normal-match/Round 078/JsonMap.json
deleted file mode 100644
index 7e78705..0000000
--- a/tests/v1-normal-match/Round 078/JsonMap.json
+++ /dev/null
@@ -1,870 +0,0 @@
-{
-  "currentRound":78,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":748
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":695
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":743
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":744
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":745
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":746
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":747
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":748
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":749
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":750
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":751
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":752
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":753
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":754
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":755
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":756
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":757
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":758
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":759
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":760
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":761
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":762
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":763
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":764
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":765
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":766
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":767
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":768
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":743
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":744
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":745
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":746
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":747
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":748
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":749
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":750
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":751
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":752
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":753
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":754
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":755
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":756
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":757
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":758
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":759
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":760
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":761
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":762
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":763
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":764
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":765
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":766
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":767
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":768
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":743
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":744
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":745
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":746
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":747
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":748
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":749
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":750
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":751
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":752
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":753
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":754
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":755
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":756
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":757
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":758
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":759
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":760
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":761
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":762
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":763
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":764
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":765
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":766
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":767
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":768
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":743
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":744
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":745
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":746
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":747
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":748
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":749
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":750
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":751
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":752
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":753
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":754
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":755
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":756
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":757
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":758
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":759
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":760
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":761
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":762
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":763
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":764
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":765
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":766
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":767
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":768
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 078/OpponentCommand.txt b/tests/v1-normal-match/Round 078/OpponentCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 078/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 078/PlayerCommand.txt b/tests/v1-normal-match/Round 078/PlayerCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 078/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 079/JsonMap.json b/tests/v1-normal-match/Round 079/JsonMap.json
deleted file mode 100644
index 0ebb423..0000000
--- a/tests/v1-normal-match/Round 079/JsonMap.json
+++ /dev/null
@@ -1,870 +0,0 @@
-{
-  "currentRound":79,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":755
-    },
-    "speed":6,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":704
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":750
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":751
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":752
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":753
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":754
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":755
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":756
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":757
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":758
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":759
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":760
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":761
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":762
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":763
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":764
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":765
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":766
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":767
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":768
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":769
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":770
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":771
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":772
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":773
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":774
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":775
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":750
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":751
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":752
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":753
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":754
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":755
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":756
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":757
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":758
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":759
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":760
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":761
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":762
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":763
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":764
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":765
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":766
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":767
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":768
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":769
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":770
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":771
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":772
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":773
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":774
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":775
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":750
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":751
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":752
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":753
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":754
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":755
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":756
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":757
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":758
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":759
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":760
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":761
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":762
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":763
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":764
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":765
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":766
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":767
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":768
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":769
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":770
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":771
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":772
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":773
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":774
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":775
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":750
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":751
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":752
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":753
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":754
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":755
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":756
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":757
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":758
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":759
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":760
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":761
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":762
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":763
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":764
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":765
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":766
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":767
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":768
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":769
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":770
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":771
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":772
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":773
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":774
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":775
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 079/OpponentCommand.txt b/tests/v1-normal-match/Round 079/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 079/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 079/PlayerCommand.txt b/tests/v1-normal-match/Round 079/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 079/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 080/JsonMap.json b/tests/v1-normal-match/Round 080/JsonMap.json
deleted file mode 100644
index a0c13cd..0000000
--- a/tests/v1-normal-match/Round 080/JsonMap.json
+++ /dev/null
@@ -1,870 +0,0 @@
-{
-  "currentRound":80,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":770
-    },
-    "speed":15,
-    "state":"USED_BOOST",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":true,
-    "boostCounter":5
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":713
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":765
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":766
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":767
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":768
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":769
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":770
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":771
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":772
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":773
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":774
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":775
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":776
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":777
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":778
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":779
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":780
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":781
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":782
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":783
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":784
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":785
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":786
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":787
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":788
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":789
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":790
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":765
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":766
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":767
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":768
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":769
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":770
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":771
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":772
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":773
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":774
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":775
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":776
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":777
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":778
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":779
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":780
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":781
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":782
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":783
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":784
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":785
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":786
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":787
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":788
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":789
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":790
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":765
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":766
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":767
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":768
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":769
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":770
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":771
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":772
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":773
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":774
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":775
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":776
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":777
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":778
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":779
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":780
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":781
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":782
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":783
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":784
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":785
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":786
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":787
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":788
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":789
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":790
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":765
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":766
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":767
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":768
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":769
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":770
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":771
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":772
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":773
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":774
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":775
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":776
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":777
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":778
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":779
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":780
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":781
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":782
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":783
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":784
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":785
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":786
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":787
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":788
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":789
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":790
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 080/OpponentCommand.txt b/tests/v1-normal-match/Round 080/OpponentCommand.txt
deleted file mode 100644
index 1baaf21..0000000
--- a/tests/v1-normal-match/Round 080/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: NOTHING
diff --git a/tests/v1-normal-match/Round 080/PlayerCommand.txt b/tests/v1-normal-match/Round 080/PlayerCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 080/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 081/JsonMap.json b/tests/v1-normal-match/Round 081/JsonMap.json
deleted file mode 100644
index bc8cc8c..0000000
--- a/tests/v1-normal-match/Round 081/JsonMap.json
+++ /dev/null
@@ -1,870 +0,0 @@
-{
-  "currentRound":81,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":785
-    },
-    "speed":15,
-    "state":"USED_OIL",
-    "powerups":[
-      "OIL",
-      "BOOST",
-      "OIL"
-    ],
-    "boosting":true,
-    "boostCounter":4
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":719
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":780
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":781
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":782
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":783
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":784
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":785
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":786
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":787
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":788
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":789
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":790
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":791
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":792
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":793
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":794
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":795
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":796
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":797
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":798
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":799
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":800
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":801
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":802
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":803
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":804
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":805
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":780
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":781
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":782
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":783
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":784
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":785
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":786
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":787
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":788
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":789
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":790
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":791
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":792
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":793
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":794
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":795
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":796
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":797
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":798
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":799
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":800
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":801
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":802
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":803
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":804
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":805
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":780
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":781
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":782
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":783
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":784
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":785
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":786
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":787
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":788
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":789
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":790
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":791
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":792
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":793
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":794
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":795
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":796
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":797
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":798
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":799
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":800
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":801
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":802
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":803
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":804
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":805
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":780
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":781
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":782
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":783
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":784
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":785
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":786
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":787
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":788
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":789
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":790
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":791
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":792
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":793
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":794
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":795
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":796
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":797
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":798
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":799
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":800
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":801
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":802
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":803
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":804
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":805
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 081/OpponentCommand.txt b/tests/v1-normal-match/Round 081/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 081/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 081/PlayerCommand.txt b/tests/v1-normal-match/Round 081/PlayerCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 081/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 082/JsonMap.json b/tests/v1-normal-match/Round 082/JsonMap.json
deleted file mode 100644
index e6598fd..0000000
--- a/tests/v1-normal-match/Round 082/JsonMap.json
+++ /dev/null
@@ -1,870 +0,0 @@
-{
-  "currentRound":82,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":800
-    },
-    "speed":15,
-    "state":"USED_OIL",
-    "powerups":[
-      "BOOST",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":true,
-    "boostCounter":3
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":734
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":795
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":796
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":797
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":798
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":799
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":800
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":801
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":802
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":803
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":804
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":805
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":806
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":807
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":808
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":809
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":810
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":811
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":812
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":813
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":814
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":815
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":816
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":817
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":818
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":819
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":820
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":795
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":796
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":797
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":798
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":799
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":800
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":801
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":802
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":803
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":804
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":805
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":806
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":807
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":808
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":809
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":810
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":811
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":812
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":813
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":814
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":815
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":816
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":817
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":818
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":819
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":820
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":795
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":796
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":797
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":798
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":799
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":800
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":801
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":802
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":803
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":804
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":805
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":806
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":807
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":808
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":809
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":810
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":811
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":812
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":813
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":814
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":815
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":816
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":817
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":818
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":819
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":820
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":795
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":796
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":797
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":798
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":799
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":800
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":801
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":802
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":803
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":804
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":805
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":806
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":807
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":808
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":809
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":810
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":811
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":812
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":813
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":814
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":815
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":816
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":817
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":818
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":819
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":820
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 082/OpponentCommand.txt b/tests/v1-normal-match/Round 082/OpponentCommand.txt
deleted file mode 100644
index 1baaf21..0000000
--- a/tests/v1-normal-match/Round 082/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: NOTHING
diff --git a/tests/v1-normal-match/Round 082/PlayerCommand.txt b/tests/v1-normal-match/Round 082/PlayerCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 082/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 083/JsonMap.json b/tests/v1-normal-match/Round 083/JsonMap.json
deleted file mode 100644
index 81e1f85..0000000
--- a/tests/v1-normal-match/Round 083/JsonMap.json
+++ /dev/null
@@ -1,870 +0,0 @@
-{
-  "currentRound":83,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":814
-    },
-    "speed":6,
-    "state":"HIT_MUD",
-    "powerups":[
-      "BOOST",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":742
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":809
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":810
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":811
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":812
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":813
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":814
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":815
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":816
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":817
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":818
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":819
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":820
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":821
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":822
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":823
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":824
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":825
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":826
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":827
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":828
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":829
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":830
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":831
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":832
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":833
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":834
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":809
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":810
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":811
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":812
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":813
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":814
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":815
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":816
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":817
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":818
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":819
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":820
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":821
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":822
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":823
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":824
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":825
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":826
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":827
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":828
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":829
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":830
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":831
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":832
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":833
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":834
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":809
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":810
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":811
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":812
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":813
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":814
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":815
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":816
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":817
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":818
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":819
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":820
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":821
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":822
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":823
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":824
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":825
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":826
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":827
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":828
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":829
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":830
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":831
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":832
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":833
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":834
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":809
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":810
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":811
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":812
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":813
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":814
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":815
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":816
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":817
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":818
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":819
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":820
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":821
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":822
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":823
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":824
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":825
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":826
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":827
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":828
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":829
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":830
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":831
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":832
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":833
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":834
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 083/OpponentCommand.txt b/tests/v1-normal-match/Round 083/OpponentCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 083/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 083/PlayerCommand.txt b/tests/v1-normal-match/Round 083/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 083/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 084/JsonMap.json b/tests/v1-normal-match/Round 084/JsonMap.json
deleted file mode 100644
index 3ebe692..0000000
--- a/tests/v1-normal-match/Round 084/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":84,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":829
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":747
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":824
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":825
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":826
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":827
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":828
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":829
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":830
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":831
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":832
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":833
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":834
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":835
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":836
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":837
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":838
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":839
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":840
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":841
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":842
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":843
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":844
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":845
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":846
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":847
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":848
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":849
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":824
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":825
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":826
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":827
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":828
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":829
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":830
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":831
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":832
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":833
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":834
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":835
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":836
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":837
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":838
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":839
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":840
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":841
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":842
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":843
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":844
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":845
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":846
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":847
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":848
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":849
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":824
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":825
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":826
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":827
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":828
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":829
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":830
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":831
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":832
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":833
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":834
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":835
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":836
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":837
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":838
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":839
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":840
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":841
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":842
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":843
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":844
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":845
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":846
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":847
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":848
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":849
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":824
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":825
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":826
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":827
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":828
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":829
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":830
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":831
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":832
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":833
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":834
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":835
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":836
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":837
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":838
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":839
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":840
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":841
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":842
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":843
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":844
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":845
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":846
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":847
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":848
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":849
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 084/OpponentCommand.txt b/tests/v1-normal-match/Round 084/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 084/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 084/PlayerCommand.txt b/tests/v1-normal-match/Round 084/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 084/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 085/JsonMap.json b/tests/v1-normal-match/Round 085/JsonMap.json
deleted file mode 100644
index ddeb86d..0000000
--- a/tests/v1-normal-match/Round 085/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":85,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":844
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":762
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":839
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":840
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":841
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":842
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":843
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":844
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":845
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":846
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":847
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":848
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":849
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":850
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":851
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":852
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":853
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":854
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":855
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":856
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":857
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":858
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":859
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":860
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":861
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":862
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":863
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":864
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":839
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":840
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":841
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":842
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":843
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":844
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":845
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":846
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":847
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":848
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":849
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":850
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":851
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":852
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":853
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":854
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":855
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":856
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":857
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":858
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":859
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":860
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":861
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":862
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":863
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":864
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":839
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":840
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":841
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":842
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":843
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":844
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":845
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":846
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":847
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":848
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":849
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":850
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":851
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":852
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":853
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":854
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":855
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":856
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":857
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":858
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":859
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":860
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":861
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":862
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":863
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":864
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":839
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":840
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":841
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":842
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":843
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":844
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":845
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":846
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":847
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":848
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":849
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":850
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":851
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":852
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":853
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":854
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":855
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":856
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":857
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":858
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":859
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":860
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":861
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":862
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":863
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":864
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 085/OpponentCommand.txt b/tests/v1-normal-match/Round 085/OpponentCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 085/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 085/PlayerCommand.txt b/tests/v1-normal-match/Round 085/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 085/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 086/JsonMap.json b/tests/v1-normal-match/Round 086/JsonMap.json
deleted file mode 100644
index 6e0eb95..0000000
--- a/tests/v1-normal-match/Round 086/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":86,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":859
-    },
-    "speed":15,
-    "state":"USED_BOOST",
-    "powerups":[
-      "OIL",
-      "OIL"
-    ],
-    "boosting":true,
-    "boostCounter":5
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":771
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":854
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":855
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":856
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":857
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":858
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":859
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":860
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":861
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":862
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":863
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":864
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":865
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":866
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":867
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":868
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":869
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":870
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":871
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":872
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":873
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":874
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":875
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":876
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":877
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":878
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":879
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":854
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":855
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":856
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":857
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":858
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":859
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":860
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":861
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":862
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":863
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":864
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":865
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":866
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":867
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":868
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":869
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":870
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":871
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":872
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":873
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":874
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":875
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":876
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":877
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":878
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":879
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":854
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":855
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":856
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":857
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":858
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":859
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":860
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":861
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":862
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":863
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":864
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":865
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":866
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":867
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":868
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":869
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":870
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":871
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":872
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":873
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":874
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":875
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":876
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":877
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":878
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":879
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":854
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":855
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":856
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":857
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":858
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":859
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":860
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":861
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":862
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":863
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":864
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":865
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":866
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":867
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":868
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":869
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":870
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":871
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":872
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":873
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":874
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":875
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":876
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":877
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":878
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":879
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 086/OpponentCommand.txt b/tests/v1-normal-match/Round 086/OpponentCommand.txt
deleted file mode 100644
index 47076cf..0000000
--- a/tests/v1-normal-match/Round 086/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_RIGHT
diff --git a/tests/v1-normal-match/Round 086/PlayerCommand.txt b/tests/v1-normal-match/Round 086/PlayerCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 086/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 087/JsonMap.json b/tests/v1-normal-match/Round 087/JsonMap.json
deleted file mode 100644
index 5588b19..0000000
--- a/tests/v1-normal-match/Round 087/JsonMap.json
+++ /dev/null
@@ -1,870 +0,0 @@
-{
-  "currentRound":87,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":873
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":778
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":868
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":869
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":870
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":871
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":872
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":873
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":874
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":875
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":876
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":877
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":878
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":879
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":880
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":881
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":882
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":883
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":884
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":885
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":886
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":887
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":888
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":889
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":890
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":891
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":892
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":893
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":868
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":869
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":870
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":871
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":872
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":873
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":874
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":875
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":876
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":877
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":878
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":879
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":880
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":881
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":882
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":883
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":884
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":885
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":886
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":887
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":888
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":889
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":890
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":891
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":892
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":893
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":868
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":869
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":870
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":871
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":872
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":873
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":874
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":875
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":876
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":877
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":878
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":879
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":880
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":881
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":882
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":883
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":884
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":885
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":886
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":887
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":888
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":889
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":890
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":891
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":892
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":893
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":868
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":869
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":870
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":871
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":872
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":873
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":874
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":875
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":876
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":877
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":878
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":879
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":880
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":881
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":882
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":883
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":884
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":885
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":886
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":887
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":888
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":889
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":890
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":891
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":892
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":893
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 087/OpponentCommand.txt b/tests/v1-normal-match/Round 087/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 087/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 087/PlayerCommand.txt b/tests/v1-normal-match/Round 087/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 087/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 088/JsonMap.json b/tests/v1-normal-match/Round 088/JsonMap.json
deleted file mode 100644
index b3a2c79..0000000
--- a/tests/v1-normal-match/Round 088/JsonMap.json
+++ /dev/null
@@ -1,870 +0,0 @@
-{
-  "currentRound":88,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":882
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":787
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":877
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":878
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":879
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":880
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":881
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":882
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":883
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":884
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":885
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":886
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":887
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":888
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":889
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":890
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":891
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":892
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":893
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":894
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":895
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":896
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":897
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":898
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":899
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":900
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":901
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":902
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":877
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":878
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":879
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":880
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":881
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":882
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":883
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":884
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":885
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":886
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":887
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":888
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":889
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":890
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":891
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":892
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":893
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":894
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":895
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":896
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":897
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":898
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":899
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":900
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":901
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":902
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":877
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":878
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":879
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":880
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":881
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":882
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":883
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":884
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":885
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":886
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":887
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":888
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":889
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":890
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":891
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":892
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":893
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":894
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":895
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":896
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":897
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":898
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":899
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":900
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":901
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":902
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":877
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":878
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":879
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":880
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":881
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":882
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":883
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":884
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":885
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":886
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":887
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":888
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":889
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":890
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":891
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":892
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":893
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":894
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":895
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":896
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":897
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":898
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":899
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":900
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":901
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":902
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 088/OpponentCommand.txt b/tests/v1-normal-match/Round 088/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 088/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 088/PlayerCommand.txt b/tests/v1-normal-match/Round 088/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 088/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 089/JsonMap.json b/tests/v1-normal-match/Round 089/JsonMap.json
deleted file mode 100644
index d5efdb5..0000000
--- a/tests/v1-normal-match/Round 089/JsonMap.json
+++ /dev/null
@@ -1,871 +0,0 @@
-{
-  "currentRound":89,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":891
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":802
-    },
-    "speed":15
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":886
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":887
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":888
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":889
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":890
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":891
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":892
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":893
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":894
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":895
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":896
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":897
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":898
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":899
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":900
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":901
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":902
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":903
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":904
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":905
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":906
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":907
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":908
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":909
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":910
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":911
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":886
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":887
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":888
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":889
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":890
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":891
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":892
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":893
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":894
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":895
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":896
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":897
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":898
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":899
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":900
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":901
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":902
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":903
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":904
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":905
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":906
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":907
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":908
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":909
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":910
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":911
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":886
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":887
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":888
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":889
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":890
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":891
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":892
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":893
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":894
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":895
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":896
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":897
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":898
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":899
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":900
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":901
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":902
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":903
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":904
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":905
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":906
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":907
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":908
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":909
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":910
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":911
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":886
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":887
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":888
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":889
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":890
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":891
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":892
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":893
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":894
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":895
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":896
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":897
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":898
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":899
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":900
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":901
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":902
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":903
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":904
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":905
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":906
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":907
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":908
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":909
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":910
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":911
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 089/OpponentCommand.txt b/tests/v1-normal-match/Round 089/OpponentCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 089/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 089/PlayerCommand.txt b/tests/v1-normal-match/Round 089/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 089/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 090/JsonMap.json b/tests/v1-normal-match/Round 090/JsonMap.json
deleted file mode 100644
index c0697a5..0000000
--- a/tests/v1-normal-match/Round 090/JsonMap.json
+++ /dev/null
@@ -1,871 +0,0 @@
-{
-  "currentRound":90,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":900
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":816
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":895
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":896
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":897
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":898
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":899
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":900
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":901
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":902
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":903
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":904
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":905
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":906
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":907
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":908
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":909
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":910
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":911
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":912
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":913
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":914
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":915
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":916
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":917
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":918
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":919
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":920
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":895
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":896
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":897
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":898
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":899
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":900
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":901
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":902
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":903
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":904
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":905
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":906
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":907
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":908
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":909
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":910
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":911
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":912
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":913
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":914
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":915
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":916
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":917
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":918
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":919
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":920
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":895
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":896
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":897
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":898
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":899
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":900
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":901
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":902
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":903
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":904
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":905
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":906
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":907
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":908
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":909
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":910
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":911
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":912
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":913
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":914
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":915
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":916
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":917
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":918
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":919
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":920
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":895
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":896
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":897
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":898
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":899
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":900
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":901
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":902
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":903
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":904
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":905
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":906
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":907
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":908
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":909
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":910
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":911
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":912
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":913
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":914
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":915
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":916
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":917
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":918
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":919
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":920
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 090/OpponentCommand.txt b/tests/v1-normal-match/Round 090/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 090/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 090/PlayerCommand.txt b/tests/v1-normal-match/Round 090/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 090/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 091/JsonMap.json b/tests/v1-normal-match/Round 091/JsonMap.json
deleted file mode 100644
index 058c5d9..0000000
--- a/tests/v1-normal-match/Round 091/JsonMap.json
+++ /dev/null
@@ -1,870 +0,0 @@
-{
-  "currentRound":91,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":915
-    },
-    "speed":9,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":831
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":910
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":911
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":912
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":913
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":914
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":915
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":916
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":917
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":918
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":919
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":920
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":921
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":922
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":923
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":924
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":925
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":926
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":927
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":928
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":929
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":930
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":931
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":932
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":933
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":934
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":935
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":910
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":911
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":912
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":913
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":914
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":915
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":916
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":917
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":918
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":919
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":920
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":921
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":922
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":923
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":924
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":925
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":926
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":927
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":928
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":929
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":930
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":931
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":932
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":933
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":934
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":935
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":910
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":911
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":912
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":913
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":914
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":915
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":916
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":917
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":918
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":919
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":920
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":921
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":922
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":923
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":924
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":925
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":926
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":927
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":928
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":929
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":930
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":931
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":932
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":933
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":934
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":935
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":910
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":911
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":912
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":913
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":914
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":915
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":916
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":917
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":918
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":919
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":920
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":921
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":922
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":923
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":924
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":925
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":926
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":927
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":928
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":929
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":930
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":931
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":932
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":933
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":934
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":935
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 091/OpponentCommand.txt b/tests/v1-normal-match/Round 091/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 091/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 091/PlayerCommand.txt b/tests/v1-normal-match/Round 091/PlayerCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 091/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 092/JsonMap.json b/tests/v1-normal-match/Round 092/JsonMap.json
deleted file mode 100644
index 2703aa8..0000000
--- a/tests/v1-normal-match/Round 092/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":92,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":924
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":846
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":919
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":920
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":921
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":922
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":923
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":924
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":925
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":926
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":927
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":928
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":929
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":930
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":931
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":932
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":933
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":934
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":935
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":936
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":937
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":938
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":939
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":940
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":941
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":942
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":943
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":944
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":919
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":920
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":921
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":922
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":923
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":924
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":925
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":926
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":927
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":928
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":929
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":930
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":931
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":932
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":933
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":934
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":935
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":936
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":937
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":938
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":939
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":940
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":941
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":942
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":943
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":944
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":919
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":920
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":921
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":922
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":923
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":924
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":925
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":926
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":927
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":928
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":929
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":930
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":931
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":932
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":933
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":934
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":935
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":936
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":937
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":938
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":939
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":940
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":941
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":942
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":943
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":944
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":919
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":920
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":921
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":922
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":923
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":924
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":925
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":926
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":927
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":928
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":929
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":930
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":931
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":932
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":933
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":934
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":935
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":936
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":937
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":938
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":939
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":940
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":941
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":942
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":943
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":944
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 092/OpponentCommand.txt b/tests/v1-normal-match/Round 092/OpponentCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 092/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 092/PlayerCommand.txt b/tests/v1-normal-match/Round 092/PlayerCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 092/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 093/JsonMap.json b/tests/v1-normal-match/Round 093/JsonMap.json
deleted file mode 100644
index a1fa3e9..0000000
--- a/tests/v1-normal-match/Round 093/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":93,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":931
-    },
-    "speed":3,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":855
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":926
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":927
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":928
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":929
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":930
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":931
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":932
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":933
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":934
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":935
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":936
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":937
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":938
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":939
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":940
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":941
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":942
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":943
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":944
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":945
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":946
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":947
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":948
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":949
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":950
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":951
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":926
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":927
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":928
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":929
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":930
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":931
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":932
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":933
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":934
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":935
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":936
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":937
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":938
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":939
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":940
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":941
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":942
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":943
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":944
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":945
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":946
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":947
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":948
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":949
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":950
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":951
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":926
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":927
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":928
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":929
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":930
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":931
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":932
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":933
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":934
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":935
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":936
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":937
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":938
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":939
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":940
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":941
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":942
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":943
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":944
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":945
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":946
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":947
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":948
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":949
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":950
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":951
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":926
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":927
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":928
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":929
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":930
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":931
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":932
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":933
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":934
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":935
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":936
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":937
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":938
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":939
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":940
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":941
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":942
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":943
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":944
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":945
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":946
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":947
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":948
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":949
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":950
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":951
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 093/OpponentCommand.txt b/tests/v1-normal-match/Round 093/OpponentCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 093/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 093/PlayerCommand.txt b/tests/v1-normal-match/Round 093/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 093/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 094/JsonMap.json b/tests/v1-normal-match/Round 094/JsonMap.json
deleted file mode 100644
index 3094925..0000000
--- a/tests/v1-normal-match/Round 094/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":94,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":937
-    },
-    "speed":3,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":864
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":932
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":933
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":934
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":935
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":936
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":937
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":938
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":939
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":940
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":941
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":942
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":943
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":944
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":945
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":946
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":947
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":948
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":949
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":950
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":951
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":952
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":953
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":954
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":955
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":956
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":957
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":932
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":933
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":934
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":935
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":936
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":937
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":938
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":939
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":940
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":941
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":942
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":943
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":944
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":945
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":946
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":947
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":948
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":949
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":950
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":951
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":952
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":953
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":954
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":955
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":956
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":957
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":932
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":933
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":934
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":935
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":936
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":937
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":938
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":939
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":940
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":941
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":942
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":943
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":944
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":945
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":946
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":947
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":948
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":949
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":950
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":951
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":952
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":953
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":954
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":955
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":956
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":957
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":932
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":933
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":934
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":935
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":936
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":937
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":938
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":939
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":940
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":941
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":942
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":943
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":944
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":945
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":946
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":947
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":948
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":949
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":950
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":951
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":952
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":953
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":954
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":955
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":956
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":957
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 094/OpponentCommand.txt b/tests/v1-normal-match/Round 094/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 094/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 094/PlayerCommand.txt b/tests/v1-normal-match/Round 094/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 094/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 095/JsonMap.json b/tests/v1-normal-match/Round 095/JsonMap.json
deleted file mode 100644
index f9d8928..0000000
--- a/tests/v1-normal-match/Round 095/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":95,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":943
-    },
-    "speed":3,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":879
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":938
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":939
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":940
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":941
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":942
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":943
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":944
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":945
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":946
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":947
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":948
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":949
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":950
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":951
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":952
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":953
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":954
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":955
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":956
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":957
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":958
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":959
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":960
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":961
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":962
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":963
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":938
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":939
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":940
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":941
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":942
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":943
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":944
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":945
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":946
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":947
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":948
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":949
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":950
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":951
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":952
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":953
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":954
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":955
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":956
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":957
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":958
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":959
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":960
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":961
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":962
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":963
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":938
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":939
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":940
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":941
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":942
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":943
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":944
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":945
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":946
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":947
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":948
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":949
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":950
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":951
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":952
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":953
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":954
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":955
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":956
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":957
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":958
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":959
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":960
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":961
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":962
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":963
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":938
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":939
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":940
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":941
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":942
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":943
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":944
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":945
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":946
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":947
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":948
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":949
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":950
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":951
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":952
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":953
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":954
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":955
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":956
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":957
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":958
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":959
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":960
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":961
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":962
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":963
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 095/OpponentCommand.txt b/tests/v1-normal-match/Round 095/OpponentCommand.txt
deleted file mode 100644
index 47076cf..0000000
--- a/tests/v1-normal-match/Round 095/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_RIGHT
diff --git a/tests/v1-normal-match/Round 095/PlayerCommand.txt b/tests/v1-normal-match/Round 095/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 095/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 096/JsonMap.json b/tests/v1-normal-match/Round 096/JsonMap.json
deleted file mode 100644
index c7c81e4..0000000
--- a/tests/v1-normal-match/Round 096/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":96,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":949
-    },
-    "speed":3,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":887
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":944
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":945
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":946
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":947
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":948
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":949
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":950
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":951
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":952
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":953
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":954
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":955
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":956
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":957
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":958
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":959
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":960
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":961
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":962
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":963
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":964
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":965
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":966
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":967
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":968
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":969
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":944
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":945
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":946
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":947
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":948
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":949
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":950
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":951
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":952
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":953
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":954
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":955
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":956
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":957
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":958
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":959
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":960
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":961
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":962
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":963
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":964
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":965
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":966
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":967
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":968
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":969
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":944
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":945
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":946
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":947
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":948
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":949
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":950
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":951
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":952
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":953
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":954
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":955
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":956
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":957
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":958
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":959
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":960
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":961
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":962
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":963
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":964
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":965
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":966
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":967
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":968
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":969
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":944
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":945
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":946
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":947
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":948
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":949
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":950
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":951
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":952
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":953
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":954
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":955
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":956
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":957
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":958
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":959
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":960
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":961
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":962
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":963
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":964
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":965
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":966
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":967
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":968
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":969
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 096/OpponentCommand.txt b/tests/v1-normal-match/Round 096/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 096/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 096/PlayerCommand.txt b/tests/v1-normal-match/Round 096/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 096/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 097/JsonMap.json b/tests/v1-normal-match/Round 097/JsonMap.json
deleted file mode 100644
index 2453919..0000000
--- a/tests/v1-normal-match/Round 097/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":97,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":955
-    },
-    "speed":6,
-    "state":"ACCELERATING",
-    "powerups":[
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":902
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":950
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":951
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":952
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":953
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":954
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":955
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":956
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":957
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":958
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":959
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":960
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":961
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":962
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":963
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":964
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":965
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":966
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":967
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":968
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":969
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":970
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":971
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":972
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":973
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":974
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":975
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":950
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":951
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":952
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":953
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":954
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":955
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":956
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":957
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":958
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":959
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":960
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":961
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":962
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":963
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":964
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":965
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":966
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":967
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":968
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":969
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":970
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":971
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":972
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":973
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":974
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":975
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":950
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":951
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":952
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":953
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":954
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":955
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":956
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":957
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":958
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":959
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":960
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":961
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":962
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":963
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":964
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":965
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":966
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":967
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":968
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":969
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":970
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":971
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":972
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":973
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":974
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":975
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":950
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":951
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":952
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":953
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":954
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":955
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":956
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":957
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":958
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":959
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":960
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":961
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":962
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":963
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":964
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":965
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":966
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":967
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":968
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":969
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":970
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":971
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":972
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":973
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":974
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":975
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 097/OpponentCommand.txt b/tests/v1-normal-match/Round 097/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 097/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 097/PlayerCommand.txt b/tests/v1-normal-match/Round 097/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 097/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 098/JsonMap.json b/tests/v1-normal-match/Round 098/JsonMap.json
deleted file mode 100644
index df995fa..0000000
--- a/tests/v1-normal-match/Round 098/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":98,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":963
-    },
-    "speed":6,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":911
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":958
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":959
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":960
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":961
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":962
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":963
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":964
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":965
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":966
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":967
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":968
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":969
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":970
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":971
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":972
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":973
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":974
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":975
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":976
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":977
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":978
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":979
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":980
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":981
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":982
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":983
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":958
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":959
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":960
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":961
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":962
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":963
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":964
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":965
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":966
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":967
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":968
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":969
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":970
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":971
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":972
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":973
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":974
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":975
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":976
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":977
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":978
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":979
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":980
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":981
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":982
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":983
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":958
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":959
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":960
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":961
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":962
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":963
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":964
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":965
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":966
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":967
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":968
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":969
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":970
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":971
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":972
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":973
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":974
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":975
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":976
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":977
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":978
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":979
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":980
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":981
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":982
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":983
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":958
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":959
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":960
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":961
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":962
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":963
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":964
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":965
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":966
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":967
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":968
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":969
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":970
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":971
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":972
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":973
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":974
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":975
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":976
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":977
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":978
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":979
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":980
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":981
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":982
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":983
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 098/OpponentCommand.txt b/tests/v1-normal-match/Round 098/OpponentCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 098/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 098/PlayerCommand.txt b/tests/v1-normal-match/Round 098/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 098/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 099/JsonMap.json b/tests/v1-normal-match/Round 099/JsonMap.json
deleted file mode 100644
index 23b4687..0000000
--- a/tests/v1-normal-match/Round 099/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":99,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":971
-    },
-    "speed":8,
-    "state":"ACCELERATING",
-    "powerups":[
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":920
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":966
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":967
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":968
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":969
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":970
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":971
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":972
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":973
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":974
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":975
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":976
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":977
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":978
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":979
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":980
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":981
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":982
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":983
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":984
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":985
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":986
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":987
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":988
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":989
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":990
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":991
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":966
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":967
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":968
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":969
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":970
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":971
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":972
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":973
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":974
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":975
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":976
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":977
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":978
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":979
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":980
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":981
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":982
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":983
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":984
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":985
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":986
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":987
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":988
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":989
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":990
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":991
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":966
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":967
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":968
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":969
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":970
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":971
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":972
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":973
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":974
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":975
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":976
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":977
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":978
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":979
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":980
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":981
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":982
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":983
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":984
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":985
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":986
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":987
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":988
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":989
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":990
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":991
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":966
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":967
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":968
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":969
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":970
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":971
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":972
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":973
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":974
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":975
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":976
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":977
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":978
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":979
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":980
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":981
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":982
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":983
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":984
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":985
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":986
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":987
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":988
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":989
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":990
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":991
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 099/OpponentCommand.txt b/tests/v1-normal-match/Round 099/OpponentCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 099/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 099/PlayerCommand.txt b/tests/v1-normal-match/Round 099/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 099/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 100/JsonMap.json b/tests/v1-normal-match/Round 100/JsonMap.json
deleted file mode 100644
index 5b46d0e..0000000
--- a/tests/v1-normal-match/Round 100/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":100,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":980
-    },
-    "speed":9,
-    "state":"ACCELERATING",
-    "powerups":[
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":928
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":975
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":976
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":977
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":978
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":979
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":980
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":981
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":982
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":983
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":984
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":985
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":986
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":987
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":988
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":989
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":990
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":991
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":992
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":993
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":994
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":995
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":996
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":997
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":998
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":999
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1000
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":975
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":976
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":977
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":978
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":979
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":980
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":981
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":982
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":983
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":984
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":985
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":986
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":987
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":988
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":989
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":990
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":991
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":992
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":993
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":994
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":995
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":996
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":997
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":998
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":999
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1000
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":975
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":976
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":977
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":978
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":979
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":980
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":981
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":982
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":983
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":984
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":985
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":986
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":987
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":988
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":989
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":990
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":991
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":992
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":993
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":994
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":995
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":996
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":997
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":998
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":999
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1000
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":975
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":976
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":977
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":978
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":979
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":980
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":981
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":982
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":983
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":984
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":985
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":986
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":987
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":988
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":989
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":990
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":991
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":992
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":993
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":994
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":995
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":996
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":997
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":998
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":999
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1000
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 100/OpponentCommand.txt b/tests/v1-normal-match/Round 100/OpponentCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 100/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 100/PlayerCommand.txt b/tests/v1-normal-match/Round 100/PlayerCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 100/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 101/JsonMap.json b/tests/v1-normal-match/Round 101/JsonMap.json
deleted file mode 100644
index 4cee9da..0000000
--- a/tests/v1-normal-match/Round 101/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":101,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":989
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":937
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":984
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":985
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":986
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":987
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":988
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":989
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":990
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":991
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":992
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":993
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":994
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":995
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":996
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":997
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":998
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":999
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1000
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1001
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1002
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1003
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1004
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1005
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1006
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1007
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1008
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1009
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":984
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":985
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":986
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":987
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":988
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":989
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":990
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":991
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":992
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":993
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":994
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":995
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":996
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":997
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":998
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":999
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1000
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1001
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1002
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1003
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1004
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1005
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1006
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1007
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1008
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1009
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":984
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":985
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":986
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":987
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":988
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":989
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":990
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":991
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":992
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":993
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":994
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":995
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":996
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":997
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":998
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":999
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1000
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1001
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1002
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1003
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1004
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1005
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1006
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1007
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1008
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1009
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":984
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":985
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":986
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":987
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":988
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":989
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":990
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":991
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":992
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":993
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":994
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":995
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":996
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":997
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":998
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":999
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1000
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1001
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1002
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1003
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1004
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1005
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1006
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1007
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1008
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1009
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 101/OpponentCommand.txt b/tests/v1-normal-match/Round 101/OpponentCommand.txt
deleted file mode 100644
index 47076cf..0000000
--- a/tests/v1-normal-match/Round 101/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_RIGHT
diff --git a/tests/v1-normal-match/Round 101/PlayerCommand.txt b/tests/v1-normal-match/Round 101/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 101/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 102/JsonMap.json b/tests/v1-normal-match/Round 102/JsonMap.json
deleted file mode 100644
index a1de343..0000000
--- a/tests/v1-normal-match/Round 102/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":102,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":998
-    },
-    "speed":9,
-    "state":"ACCELERATING",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":945
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":993
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":994
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":995
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":996
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":997
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":998
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":999
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1000
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1001
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1002
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1003
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1004
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1005
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1006
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1007
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1008
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1009
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1010
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1011
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1012
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1013
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1014
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1015
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1016
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1017
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1018
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":993
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":994
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":995
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":996
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":997
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":998
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":999
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1000
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1001
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1002
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1003
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1004
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1005
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1006
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1007
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1008
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1009
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1010
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1011
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1012
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1013
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1014
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1015
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1016
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1017
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1018
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":993
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":994
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":995
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":996
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":997
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":998
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":999
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1000
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1001
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1002
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1003
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1004
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1005
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1006
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1007
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1008
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1009
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1010
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1011
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1012
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1013
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1014
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1015
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1016
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1017
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1018
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":993
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":994
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":995
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":996
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":997
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":998
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":999
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1000
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1001
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1002
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1003
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1004
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1005
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1006
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1007
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1008
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1009
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1010
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1011
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1012
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1013
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1014
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1015
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1016
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1017
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1018
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 102/OpponentCommand.txt b/tests/v1-normal-match/Round 102/OpponentCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 102/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 102/PlayerCommand.txt b/tests/v1-normal-match/Round 102/PlayerCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 102/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 103/JsonMap.json b/tests/v1-normal-match/Round 103/JsonMap.json
deleted file mode 100644
index fa34eab..0000000
--- a/tests/v1-normal-match/Round 103/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":103,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1007
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":954
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1002
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1003
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1004
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1005
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1006
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1007
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1008
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1009
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1010
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1011
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1012
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1013
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1014
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1015
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1016
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1017
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1018
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1019
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1020
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1021
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1022
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1023
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1024
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1025
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1026
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1027
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1002
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1003
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1004
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1005
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1006
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1007
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1008
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1009
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1010
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1011
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1012
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1013
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1014
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1015
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1016
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1017
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1018
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1019
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1020
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1021
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1022
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1023
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1024
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1025
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1026
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1027
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1002
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1003
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1004
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1005
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1006
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1007
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1008
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1009
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1010
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1011
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1012
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1013
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1014
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1015
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1016
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1017
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1018
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1019
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1020
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1021
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1022
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1023
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1024
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1025
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1026
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1027
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1002
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1003
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1004
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1005
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1006
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1007
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1008
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1009
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1010
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1011
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1012
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1013
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1014
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1015
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1016
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1017
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1018
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1019
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1020
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1021
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1022
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1023
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1024
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1025
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1026
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1027
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 103/OpponentCommand.txt b/tests/v1-normal-match/Round 103/OpponentCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 103/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 103/PlayerCommand.txt b/tests/v1-normal-match/Round 103/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 103/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 104/JsonMap.json b/tests/v1-normal-match/Round 104/JsonMap.json
deleted file mode 100644
index 57797d9..0000000
--- a/tests/v1-normal-match/Round 104/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":104,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1016
-    },
-    "speed":6,
-    "state":"HIT_MUD",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":963
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1011
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1012
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1013
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1014
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1015
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1016
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1017
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1018
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1019
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1020
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1021
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1022
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1023
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1024
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1025
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1026
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1027
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1028
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1029
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1030
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1031
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1032
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1033
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1034
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1035
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1036
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1011
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1012
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1013
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1014
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1015
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1016
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1017
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1018
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1019
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1020
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1021
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1022
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1023
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1024
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1025
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1026
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1027
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1028
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1029
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1030
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1031
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1032
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1033
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1034
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1035
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1036
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1011
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1012
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1013
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1014
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1015
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1016
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1017
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1018
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1019
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1020
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1021
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1022
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1023
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1024
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1025
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1026
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1027
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1028
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1029
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1030
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1031
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1032
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1033
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1034
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1035
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1036
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1011
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1012
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1013
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1014
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1015
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1016
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1017
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1018
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1019
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1020
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1021
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1022
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1023
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1024
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1025
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1026
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1027
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1028
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1029
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1030
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1031
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1032
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1033
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1034
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1035
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1036
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 104/OpponentCommand.txt b/tests/v1-normal-match/Round 104/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 104/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 104/PlayerCommand.txt b/tests/v1-normal-match/Round 104/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 104/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 105/JsonMap.json b/tests/v1-normal-match/Round 105/JsonMap.json
deleted file mode 100644
index 8d01ee6..0000000
--- a/tests/v1-normal-match/Round 105/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":105,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1024
-    },
-    "speed":8,
-    "state":"ACCELERATING",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":972
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1019
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1020
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1021
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1022
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1023
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1024
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1025
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1026
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1027
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1028
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1029
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1030
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1031
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1032
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1033
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1034
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1035
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1036
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1037
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1038
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1039
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1040
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1041
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1042
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1043
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1044
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1019
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1020
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1021
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1022
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1023
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1024
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1025
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1026
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1027
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1028
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1029
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1030
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1031
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1032
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1033
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1034
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1035
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1036
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1037
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1038
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1039
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1040
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1041
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1042
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1043
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1044
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1019
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1020
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1021
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1022
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1023
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1024
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1025
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1026
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1027
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1028
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1029
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1030
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1031
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1032
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1033
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1034
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1035
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1036
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1037
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1038
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1039
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1040
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1041
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1042
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1043
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1044
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1019
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1020
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1021
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1022
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1023
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1024
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1025
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1026
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1027
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1028
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1029
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1030
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1031
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1032
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1033
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1034
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1035
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1036
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1037
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1038
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1039
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1040
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1041
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1042
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1043
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1044
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 105/OpponentCommand.txt b/tests/v1-normal-match/Round 105/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 105/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 105/PlayerCommand.txt b/tests/v1-normal-match/Round 105/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 105/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 106/JsonMap.json b/tests/v1-normal-match/Round 106/JsonMap.json
deleted file mode 100644
index 5ba03b6..0000000
--- a/tests/v1-normal-match/Round 106/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":106,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1033
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":981
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1028
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1029
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1030
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1031
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1032
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1033
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1034
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1035
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1036
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1037
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1038
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1039
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1040
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1041
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1042
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1043
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1044
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1045
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1046
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1047
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1048
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1049
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1050
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1051
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1052
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1053
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1028
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1029
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1030
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1031
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1032
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1033
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1034
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1035
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1036
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1037
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1038
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1039
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1040
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1041
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1042
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1043
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1044
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1045
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1046
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1047
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1048
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1049
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1050
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1051
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1052
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1053
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1028
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1029
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1030
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1031
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1032
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1033
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1034
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1035
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1036
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1037
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1038
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1039
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1040
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1041
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1042
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1043
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1044
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1045
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1046
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1047
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1048
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1049
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1050
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1051
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1052
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1053
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1028
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1029
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1030
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1031
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1032
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1033
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1034
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1035
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1036
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1037
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1038
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1039
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1040
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1041
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1042
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1043
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1044
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1045
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1046
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1047
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1048
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1049
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1050
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1051
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1052
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1053
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 106/OpponentCommand.txt b/tests/v1-normal-match/Round 106/OpponentCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 106/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 106/PlayerCommand.txt b/tests/v1-normal-match/Round 106/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 106/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 107/JsonMap.json b/tests/v1-normal-match/Round 107/JsonMap.json
deleted file mode 100644
index 1d24841..0000000
--- a/tests/v1-normal-match/Round 107/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":107,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1042
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":990
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1037
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1038
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1039
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1040
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1041
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1042
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1043
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1044
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1045
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1046
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1047
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1048
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1049
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1050
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1051
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1052
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1053
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1054
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1055
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1056
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1057
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1058
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1059
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1060
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1061
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1062
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1037
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1038
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1039
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1040
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1041
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1042
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1043
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1044
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1045
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1046
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1047
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1048
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1049
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1050
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1051
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1052
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1053
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1054
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1055
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1056
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1057
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1058
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1059
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1060
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1061
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1062
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1037
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1038
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1039
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1040
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1041
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1042
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1043
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1044
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1045
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1046
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1047
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1048
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1049
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1050
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1051
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1052
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1053
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1054
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1055
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1056
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1057
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1058
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1059
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1060
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1061
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1062
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1037
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1038
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1039
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1040
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1041
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1042
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1043
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1044
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1045
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1046
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1047
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1048
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1049
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1050
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1051
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1052
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1053
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1054
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1055
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1056
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1057
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1058
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1059
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1060
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1061
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1062
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 107/OpponentCommand.txt b/tests/v1-normal-match/Round 107/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 107/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 107/PlayerCommand.txt b/tests/v1-normal-match/Round 107/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 107/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 108/JsonMap.json b/tests/v1-normal-match/Round 108/JsonMap.json
deleted file mode 100644
index eb1b63d..0000000
--- a/tests/v1-normal-match/Round 108/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":108,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1051
-    },
-    "speed":9,
-    "state":"ACCELERATING",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":999
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1046
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1047
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1048
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1049
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1050
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1051
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1052
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1053
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1054
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1055
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1056
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1057
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1058
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1059
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1060
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1061
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1062
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1063
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1064
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1065
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1066
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1067
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1068
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1069
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1070
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1071
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1046
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1047
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1048
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1049
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1050
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1051
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1052
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1053
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1054
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1055
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1056
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1057
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1058
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1059
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1060
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1061
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1062
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1063
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1064
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1065
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1066
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1067
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1068
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1069
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1070
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1071
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1046
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1047
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1048
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1049
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1050
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1051
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1052
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1053
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1054
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1055
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1056
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1057
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1058
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1059
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1060
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1061
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1062
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1063
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1064
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1065
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1066
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1067
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1068
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1069
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1070
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1071
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1046
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1047
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1048
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1049
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1050
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1051
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1052
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1053
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1054
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1055
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1056
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1057
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1058
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1059
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1060
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1061
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1062
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1063
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1064
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1065
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1066
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1067
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1068
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1069
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1070
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1071
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 108/OpponentCommand.txt b/tests/v1-normal-match/Round 108/OpponentCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 108/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 108/PlayerCommand.txt b/tests/v1-normal-match/Round 108/PlayerCommand.txt
deleted file mode 100644
index 1baaf21..0000000
--- a/tests/v1-normal-match/Round 108/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: NOTHING
diff --git a/tests/v1-normal-match/Round 109/JsonMap.json b/tests/v1-normal-match/Round 109/JsonMap.json
deleted file mode 100644
index cc14dc2..0000000
--- a/tests/v1-normal-match/Round 109/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":109,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1060
-    },
-    "speed":6,
-    "state":"HIT_MUD",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":1007
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1055
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1056
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1057
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1058
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1059
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1060
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1061
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1062
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1063
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1064
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1065
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1066
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1067
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1068
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1069
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1070
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1071
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1072
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1073
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1074
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1075
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1076
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1077
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1078
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1079
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1080
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1055
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1056
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1057
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1058
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1059
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1060
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1061
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1062
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1063
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1064
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1065
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1066
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1067
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1068
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1069
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1070
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1071
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1072
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1073
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1074
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1075
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1076
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1077
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1078
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1079
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1080
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1055
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1056
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1057
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1058
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1059
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1060
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1061
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1062
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1063
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1064
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1065
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1066
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1067
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1068
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1069
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1070
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1071
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1072
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1073
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1074
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1075
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1076
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1077
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1078
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1079
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1080
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1055
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1056
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1057
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1058
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1059
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1060
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1061
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1062
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1063
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1064
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1065
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1066
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1067
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1068
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1069
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1070
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1071
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1072
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1073
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1074
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1075
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1076
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1077
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1078
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1079
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1080
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 109/OpponentCommand.txt b/tests/v1-normal-match/Round 109/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 109/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 109/PlayerCommand.txt b/tests/v1-normal-match/Round 109/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 109/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 110/JsonMap.json b/tests/v1-normal-match/Round 110/JsonMap.json
deleted file mode 100644
index 1eba2e0..0000000
--- a/tests/v1-normal-match/Round 110/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":110,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1068
-    },
-    "speed":6,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":1016
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1063
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1064
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1065
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1066
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1067
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1068
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1069
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1070
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1071
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1072
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1073
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1074
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1075
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1076
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1077
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1078
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1079
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1080
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1081
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1082
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1083
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1084
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1085
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1086
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1087
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1088
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1063
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1064
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1065
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1066
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1067
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1068
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1069
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1070
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1071
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1072
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1073
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1074
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1075
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1076
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1077
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1078
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1079
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1080
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1081
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1082
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1083
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1084
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1085
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1086
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1087
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1088
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1063
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1064
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1065
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1066
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1067
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1068
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1069
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1070
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1071
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1072
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1073
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1074
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1075
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1076
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1077
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1078
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1079
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1080
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1081
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1082
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1083
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1084
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1085
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1086
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1087
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1088
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1063
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1064
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1065
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1066
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1067
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1068
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1069
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1070
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1071
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1072
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1073
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1074
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1075
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1076
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1077
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1078
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1079
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1080
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1081
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1082
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1083
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1084
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1085
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1086
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1087
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1088
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 110/OpponentCommand.txt b/tests/v1-normal-match/Round 110/OpponentCommand.txt
deleted file mode 100644
index 47076cf..0000000
--- a/tests/v1-normal-match/Round 110/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_RIGHT
diff --git a/tests/v1-normal-match/Round 110/PlayerCommand.txt b/tests/v1-normal-match/Round 110/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 110/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 111/JsonMap.json b/tests/v1-normal-match/Round 111/JsonMap.json
deleted file mode 100644
index ffec152..0000000
--- a/tests/v1-normal-match/Round 111/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":111,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1083
-    },
-    "speed":9,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":1024
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1078
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1079
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1080
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1081
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1082
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1083
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1084
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1085
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1086
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1087
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1088
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1089
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1090
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1091
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1092
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1093
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1094
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1095
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1096
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1097
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1098
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1099
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1100
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1101
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1102
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1103
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1078
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1079
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1080
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1081
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1082
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1083
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1084
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1085
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1086
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1087
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1088
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1089
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1090
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1091
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1092
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1093
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1094
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1095
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1096
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1097
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1098
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1099
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1100
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1101
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1102
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1103
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1078
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1079
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1080
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1081
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1082
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1083
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1084
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1085
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1086
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1087
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1088
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1089
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1090
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1091
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1092
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1093
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1094
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1095
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1096
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1097
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1098
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1099
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1100
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1101
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1102
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1103
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1078
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1079
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1080
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1081
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1082
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1083
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1084
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1085
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1086
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1087
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1088
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1089
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1090
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1091
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1092
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1093
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1094
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1095
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1096
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1097
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1098
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1099
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1100
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1101
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1102
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1103
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 111/OpponentCommand.txt b/tests/v1-normal-match/Round 111/OpponentCommand.txt
deleted file mode 100644
index 1baaf21..0000000
--- a/tests/v1-normal-match/Round 111/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: NOTHING
diff --git a/tests/v1-normal-match/Round 111/PlayerCommand.txt b/tests/v1-normal-match/Round 111/PlayerCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 111/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 112/JsonMap.json b/tests/v1-normal-match/Round 112/JsonMap.json
deleted file mode 100644
index 74aa44e..0000000
--- a/tests/v1-normal-match/Round 112/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":112,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1092
-    },
-    "speed":9,
-    "state":"USED_OIL",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":1033
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1087
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1088
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1089
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1090
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1091
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1092
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1093
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1094
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1095
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1096
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1097
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1098
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1099
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1100
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1101
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1102
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1103
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1104
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1105
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1106
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1107
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1109
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1110
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1111
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1112
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1087
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1088
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1089
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1090
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1091
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1092
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1093
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1094
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1095
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1096
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1097
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1098
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1099
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1100
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1101
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1102
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1103
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1104
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1105
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1106
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1107
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1109
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1110
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1111
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1112
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1087
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1088
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1089
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1090
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1091
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1092
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1093
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1094
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1095
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1096
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1097
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1098
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1099
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1100
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1101
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1102
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1103
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1104
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1105
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1106
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1107
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1109
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1110
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1111
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1112
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1087
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1088
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1089
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1090
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1091
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1092
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1093
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1094
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1095
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1096
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1097
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1098
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1099
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1100
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1101
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1102
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1103
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1104
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1105
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1106
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1107
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1109
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1110
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1111
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1112
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 112/OpponentCommand.txt b/tests/v1-normal-match/Round 112/OpponentCommand.txt
deleted file mode 100644
index 1baaf21..0000000
--- a/tests/v1-normal-match/Round 112/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: NOTHING
diff --git a/tests/v1-normal-match/Round 112/PlayerCommand.txt b/tests/v1-normal-match/Round 112/PlayerCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 112/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 113/JsonMap.json b/tests/v1-normal-match/Round 113/JsonMap.json
deleted file mode 100644
index 77a4147..0000000
--- a/tests/v1-normal-match/Round 113/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":113,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1101
-    },
-    "speed":9,
-    "state":"USED_OIL",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":1042
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1096
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1097
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1098
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1099
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1100
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1101
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1102
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1103
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1104
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1105
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1106
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1107
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1109
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1110
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1111
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1112
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1113
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1114
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1115
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1118
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1119
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1120
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1121
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1096
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1097
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1098
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1099
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1100
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1101
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1102
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1103
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1104
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1105
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1106
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1107
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1109
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1110
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1111
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1112
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1113
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1114
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1115
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1118
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1119
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1120
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1121
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1096
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1097
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1098
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1099
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1100
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1101
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1102
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1103
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1104
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1105
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1106
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1107
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1109
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1110
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1111
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1112
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1113
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1114
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1115
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1118
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1119
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1120
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1121
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1096
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1097
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1098
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1099
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1100
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1101
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1102
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1103
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1104
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1105
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1106
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1107
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1109
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1110
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1111
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1112
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1113
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1114
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1115
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1118
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1119
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1120
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1121
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 113/OpponentCommand.txt b/tests/v1-normal-match/Round 113/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 113/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 113/PlayerCommand.txt b/tests/v1-normal-match/Round 113/PlayerCommand.txt
deleted file mode 100644
index 1baaf21..0000000
--- a/tests/v1-normal-match/Round 113/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: NOTHING
diff --git a/tests/v1-normal-match/Round 114/JsonMap.json b/tests/v1-normal-match/Round 114/JsonMap.json
deleted file mode 100644
index ef92766..0000000
--- a/tests/v1-normal-match/Round 114/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":114,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1110
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":1050
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1105
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1106
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1107
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1109
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1110
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1111
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1112
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1113
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1114
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1115
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1118
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1119
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1120
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1121
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1122
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1124
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1125
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1129
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1105
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1106
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1107
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1109
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1110
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1111
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1112
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1113
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1114
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1115
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1118
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1119
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1120
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1121
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1122
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1124
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1125
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1129
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1105
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1106
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1107
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1109
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1110
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1111
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1112
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1113
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1114
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1115
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1118
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1119
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1120
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1121
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1122
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1124
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1125
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1129
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1105
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1106
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1107
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1108
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1109
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1110
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1111
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1112
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1113
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1114
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1115
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1118
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1119
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1120
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1121
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1122
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1124
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1125
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1129
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 114/OpponentCommand.txt b/tests/v1-normal-match/Round 114/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 114/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 114/PlayerCommand.txt b/tests/v1-normal-match/Round 114/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 114/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 115/JsonMap.json b/tests/v1-normal-match/Round 115/JsonMap.json
deleted file mode 100644
index 1626735..0000000
--- a/tests/v1-normal-match/Round 115/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":115,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1119
-    },
-    "speed":6,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":1065
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1114
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1115
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1118
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1119
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1120
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1121
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1122
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1124
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1125
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1129
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1131
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1132
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1134
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1137
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1138
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1139
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1114
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1115
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1118
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1119
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1120
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1121
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1122
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1124
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1125
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1129
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1131
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1132
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1134
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1137
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1139
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1114
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1115
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1118
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1119
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1120
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1121
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1122
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1124
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1125
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1129
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1131
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1132
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1134
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1137
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1139
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1114
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1115
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1116
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1117
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1118
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1119
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1120
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1121
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1122
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1124
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1125
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1129
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1131
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1132
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1134
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1136
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1137
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1139
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 115/OpponentCommand.txt b/tests/v1-normal-match/Round 115/OpponentCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 115/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 115/PlayerCommand.txt b/tests/v1-normal-match/Round 115/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 115/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 116/JsonMap.json b/tests/v1-normal-match/Round 116/JsonMap.json
deleted file mode 100644
index b81a84d..0000000
--- a/tests/v1-normal-match/Round 116/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":116,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1127
-    },
-    "speed":6,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":1072
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1122
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1124
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1125
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1129
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1131
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1132
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1134
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1137
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1138
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1139
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1140
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1141
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1142
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1143
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1145
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1147
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1122
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1124
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1125
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1129
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1131
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1132
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1134
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1137
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1139
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1140
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1141
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1142
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1143
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1145
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1147
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1122
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1124
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1125
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1129
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1131
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1132
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1134
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1137
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1139
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1140
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1141
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1142
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1143
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1145
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1147
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1122
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1123
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1124
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1125
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1126
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1127
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1128
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1129
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1131
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1132
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1134
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1136
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1137
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1139
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1140
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1141
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1142
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1143
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1145
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1147
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 116/OpponentCommand.txt b/tests/v1-normal-match/Round 116/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 116/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 116/PlayerCommand.txt b/tests/v1-normal-match/Round 116/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 116/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 117/JsonMap.json b/tests/v1-normal-match/Round 117/JsonMap.json
deleted file mode 100644
index 3055e5c..0000000
--- a/tests/v1-normal-match/Round 117/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":117,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1135
-    },
-    "speed":3,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":1087
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1131
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1132
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1134
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1137
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1138
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1139
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1140
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1141
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1142
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1143
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1145
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1147
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1148
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1149
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1150
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1151
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1152
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1153
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1154
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1131
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1132
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1134
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1137
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1139
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1140
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1141
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1142
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1143
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1145
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1147
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1148
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1149
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1150
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1151
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1152
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1153
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1154
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1131
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1132
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1134
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1137
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1139
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1140
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1141
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1142
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1143
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1145
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1147
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1148
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1149
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1150
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1151
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1152
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1153
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1154
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1130
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1131
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1132
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1133
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1134
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1135
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1136
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1137
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1139
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1140
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1141
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1142
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1143
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1145
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1147
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1148
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1149
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1150
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1151
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1152
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1153
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1154
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 117/OpponentCommand.txt b/tests/v1-normal-match/Round 117/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 117/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 117/PlayerCommand.txt b/tests/v1-normal-match/Round 117/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 117/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 118/JsonMap.json b/tests/v1-normal-match/Round 118/JsonMap.json
deleted file mode 100644
index 30e1ee0..0000000
--- a/tests/v1-normal-match/Round 118/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":118,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1141
-    },
-    "speed":3,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":1102
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1137
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1138
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1139
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1140
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1141
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1142
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1143
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1145
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1147
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1148
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1149
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1150
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1151
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1152
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1153
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1154
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1156
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1157
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1158
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1159
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1160
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1161
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1137
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1139
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1140
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1141
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1142
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1143
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1145
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1147
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1148
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1149
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1150
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1151
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1152
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1153
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1154
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1156
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1157
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1158
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1159
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1160
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1161
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1136
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1137
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1139
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1140
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1141
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1142
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1143
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1145
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1147
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1148
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1149
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1150
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1151
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1152
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1153
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1154
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1156
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1157
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1158
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1159
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1160
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1161
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1136
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1137
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1138
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1139
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1140
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1141
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1142
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1143
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1145
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1147
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1148
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1149
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1150
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1151
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1152
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1153
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1154
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1156
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1157
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1158
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1159
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1160
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1161
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 118/OpponentCommand.txt b/tests/v1-normal-match/Round 118/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 118/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 118/PlayerCommand.txt b/tests/v1-normal-match/Round 118/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 118/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 119/JsonMap.json b/tests/v1-normal-match/Round 119/JsonMap.json
deleted file mode 100644
index 9b87460..0000000
--- a/tests/v1-normal-match/Round 119/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":119,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1147
-    },
-    "speed":6,
-    "state":"ACCELERATING",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":1111
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1142
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1143
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1145
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1147
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1148
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1149
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1150
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1151
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1152
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1153
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1154
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1156
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1157
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1158
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1159
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1160
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1161
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1162
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1163
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1164
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1165
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1166
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1167
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1142
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1143
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1145
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1147
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1148
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1149
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1150
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1151
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1152
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1153
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1154
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1156
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1157
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1158
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1159
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1160
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1161
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1162
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1163
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1164
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1165
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1166
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1167
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1142
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1143
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1145
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1147
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1148
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1149
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1150
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1151
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1152
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1153
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1154
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1156
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1157
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1158
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1159
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1160
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1161
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1162
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1163
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1164
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1165
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1166
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1167
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1142
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1143
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1144
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1145
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1146
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1147
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1148
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1149
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1150
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1151
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1152
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1153
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1154
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1156
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1157
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1158
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1159
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1160
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1161
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1162
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1163
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1164
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1165
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1166
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1167
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 119/OpponentCommand.txt b/tests/v1-normal-match/Round 119/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 119/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 119/PlayerCommand.txt b/tests/v1-normal-match/Round 119/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 119/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 120/JsonMap.json b/tests/v1-normal-match/Round 120/JsonMap.json
deleted file mode 100644
index b518588..0000000
--- a/tests/v1-normal-match/Round 120/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":120,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1155
-    },
-    "speed":8,
-    "state":"ACCELERATING",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":1120
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1150
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1151
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1152
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1153
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1154
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1156
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1157
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1158
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1159
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1160
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1161
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1162
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1163
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1164
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1165
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1166
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1167
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1168
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1169
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1170
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1172
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1173
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1174
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1175
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1150
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1151
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1152
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1153
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1154
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1156
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1157
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1158
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1159
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1160
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1161
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1162
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1163
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1164
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1165
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1166
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1167
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1168
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1169
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1170
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1172
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1173
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1174
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1175
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1150
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1151
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1152
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1153
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1154
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1156
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1157
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1158
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1159
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1160
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1161
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1162
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1163
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1164
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1165
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1166
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1167
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1168
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1169
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1170
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1172
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1173
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1174
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1175
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1150
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1151
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1152
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1153
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1154
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1155
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1156
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1157
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1158
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1159
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1160
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1161
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1162
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1163
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1164
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1165
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1166
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1167
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1168
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1169
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1170
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1172
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1173
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1174
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1175
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 120/OpponentCommand.txt b/tests/v1-normal-match/Round 120/OpponentCommand.txt
deleted file mode 100644
index 1baaf21..0000000
--- a/tests/v1-normal-match/Round 120/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: NOTHING
diff --git a/tests/v1-normal-match/Round 120/PlayerCommand.txt b/tests/v1-normal-match/Round 120/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 120/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 121/JsonMap.json b/tests/v1-normal-match/Round 121/JsonMap.json
deleted file mode 100644
index dd54873..0000000
--- a/tests/v1-normal-match/Round 121/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":121,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1164
-    },
-    "speed":9,
-    "state":"ACCELERATING",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":1129
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1159
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1160
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1161
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1162
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1163
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1164
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1165
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1166
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1167
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1168
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1169
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1170
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1172
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1173
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1174
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1175
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1176
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1177
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1178
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1179
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1181
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1182
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1159
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1160
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1161
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1162
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1163
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1164
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1165
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1166
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1167
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1168
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1169
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1170
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1172
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1173
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1174
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1175
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1176
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1177
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1178
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1179
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1181
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1182
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1159
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1160
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1161
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1162
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1163
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1164
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1165
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1166
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1167
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1168
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1169
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1170
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1172
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1173
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1174
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1175
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1176
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1177
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1178
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1179
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1181
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1182
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1159
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1160
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1161
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1162
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1163
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1164
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1165
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1166
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1167
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1168
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1169
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1170
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1172
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1173
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1174
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1175
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1176
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1177
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1178
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1179
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1181
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1182
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 121/OpponentCommand.txt b/tests/v1-normal-match/Round 121/OpponentCommand.txt
deleted file mode 100644
index 1baaf21..0000000
--- a/tests/v1-normal-match/Round 121/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: NOTHING
diff --git a/tests/v1-normal-match/Round 121/PlayerCommand.txt b/tests/v1-normal-match/Round 121/PlayerCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 121/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 122/JsonMap.json b/tests/v1-normal-match/Round 122/JsonMap.json
deleted file mode 100644
index 326eaf6..0000000
--- a/tests/v1-normal-match/Round 122/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":122,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1173
-    },
-    "speed":9,
-    "state":"USED_OIL",
-    "powerups":[
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":1138
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1168
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1169
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1170
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1172
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1173
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1174
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1175
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1176
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1177
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1178
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1179
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1181
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1182
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1185
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1188
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1189
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1190
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1191
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1192
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1193
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1168
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1169
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1170
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1172
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1173
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1174
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1175
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1176
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1177
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1178
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1179
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1181
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1182
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1185
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1188
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1189
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1190
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1191
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1192
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1193
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1168
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1169
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1170
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1172
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1173
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1174
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1175
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1176
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1177
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1178
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1179
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1181
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1182
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1185
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1188
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1189
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1190
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1191
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1192
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1193
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1168
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1169
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1170
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1171
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1172
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1173
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1174
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1175
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1176
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1177
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1178
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1179
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1181
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1182
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1185
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1188
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1189
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1190
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1191
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1192
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1193
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 122/OpponentCommand.txt b/tests/v1-normal-match/Round 122/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 122/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 122/PlayerCommand.txt b/tests/v1-normal-match/Round 122/PlayerCommand.txt
deleted file mode 100644
index 1baaf21..0000000
--- a/tests/v1-normal-match/Round 122/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: NOTHING
diff --git a/tests/v1-normal-match/Round 123/JsonMap.json b/tests/v1-normal-match/Round 123/JsonMap.json
deleted file mode 100644
index e839ada..0000000
--- a/tests/v1-normal-match/Round 123/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":123,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1182
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":1147
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1177
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1178
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1179
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1181
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1182
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1185
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1188
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1189
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1190
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1191
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1192
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1193
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1194
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1195
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1196
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1197
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1198
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1199
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1200
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1201
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1177
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1178
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1179
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1181
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1182
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1185
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1188
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1189
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1190
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1191
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1192
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1193
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1194
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1195
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1196
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1197
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1198
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1199
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1200
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1201
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1177
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1178
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1179
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1181
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1182
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1185
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1188
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1189
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1190
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1191
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1192
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1193
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1194
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1195
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1196
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1197
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1198
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1199
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1200
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1201
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1177
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1178
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1179
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1180
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1181
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1182
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1183
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1184
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1185
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1186
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1187
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1188
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1189
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1190
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1191
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1192
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1193
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1194
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1195
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1196
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1197
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1198
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1199
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1200
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1201
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 123/OpponentCommand.txt b/tests/v1-normal-match/Round 123/OpponentCommand.txt
deleted file mode 100644
index 47076cf..0000000
--- a/tests/v1-normal-match/Round 123/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_RIGHT
diff --git a/tests/v1-normal-match/Round 123/PlayerCommand.txt b/tests/v1-normal-match/Round 123/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 123/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 124/JsonMap.json b/tests/v1-normal-match/Round 124/JsonMap.json
deleted file mode 100644
index 2432791..0000000
--- a/tests/v1-normal-match/Round 124/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":124,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1197
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":1155
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1192
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1193
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1194
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1195
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1196
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1197
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1198
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1199
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1200
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1201
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1203
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1204
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1205
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1206
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1207
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1208
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1209
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1210
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1211
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1212
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1213
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1214
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1215
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1216
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1217
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1192
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1193
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1194
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1195
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1196
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1197
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1198
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1199
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1200
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1201
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1203
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1204
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1205
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1206
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1207
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1208
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1209
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1210
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1211
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1212
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1213
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1214
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1215
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1216
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1217
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1192
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1193
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1194
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1195
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1196
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1197
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1198
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1199
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1200
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1201
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1203
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1204
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1205
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1206
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1207
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1208
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1209
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1210
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1211
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1212
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1213
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1214
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1215
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1216
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1217
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1192
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1193
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1194
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1195
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1196
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1197
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1198
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1199
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1200
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1201
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1203
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1204
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1205
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1206
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1207
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1208
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1209
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1210
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1211
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1212
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1213
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1214
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1215
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1216
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1217
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 124/OpponentCommand.txt b/tests/v1-normal-match/Round 124/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 124/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 124/PlayerCommand.txt b/tests/v1-normal-match/Round 124/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 124/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 125/JsonMap.json b/tests/v1-normal-match/Round 125/JsonMap.json
deleted file mode 100644
index f79573d..0000000
--- a/tests/v1-normal-match/Round 125/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":125,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1206
-    },
-    "speed":9,
-    "state":"ACCELERATING",
-    "powerups":[
-      "BOOST",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":1164
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1201
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1203
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1204
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1205
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1206
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1207
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1208
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1209
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1210
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1211
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1212
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1213
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1214
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1215
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1216
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1217
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1218
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1219
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1220
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1221
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1222
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1223
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1224
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1225
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1226
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1201
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1203
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1204
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1205
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1206
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1207
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1208
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1209
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1210
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1211
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1212
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1213
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1214
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1215
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1216
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1217
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1218
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1219
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1220
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1221
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1222
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1223
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1224
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1225
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1226
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1201
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1203
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1204
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1205
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1206
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1207
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1208
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1209
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1210
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1211
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1212
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1213
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1214
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1215
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1216
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1217
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1218
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1219
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1220
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1221
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1222
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1223
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1224
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1225
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1226
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1201
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1202
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1203
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1204
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1205
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1206
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1207
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1208
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1209
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1210
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1211
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1212
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1213
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1214
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1215
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1216
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1217
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1218
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1219
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1220
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1221
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1222
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1223
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1224
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1225
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1226
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 125/OpponentCommand.txt b/tests/v1-normal-match/Round 125/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 125/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 125/PlayerCommand.txt b/tests/v1-normal-match/Round 125/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 125/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 126/JsonMap.json b/tests/v1-normal-match/Round 126/JsonMap.json
deleted file mode 100644
index 2238b58..0000000
--- a/tests/v1-normal-match/Round 126/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":126,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1221
-    },
-    "speed":9,
-    "state":"HIT_MUD",
-    "powerups":[
-      "BOOST",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":1173
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1216
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1217
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1218
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1219
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1220
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1221
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1222
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1223
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1224
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1225
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1226
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1227
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1228
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1229
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1230
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1231
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1232
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1233
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1234
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1235
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1236
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1237
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1238
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1239
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1240
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1241
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1216
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1217
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1218
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1219
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1220
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1221
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1222
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1223
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1224
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1225
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1226
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1227
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1228
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1229
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1230
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1231
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1232
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1233
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1234
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1235
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1236
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1237
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1238
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1239
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1240
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1241
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1216
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1217
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1218
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1219
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1220
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1221
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1222
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1223
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1224
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1225
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1226
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1227
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1228
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1229
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1230
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1231
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1232
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1233
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1234
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1235
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1236
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1237
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1238
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1239
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1240
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1241
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1216
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1217
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1218
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1219
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1220
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1221
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1222
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1223
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1224
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1225
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1226
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1227
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1228
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1229
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1230
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1231
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1232
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1233
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1234
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1235
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1236
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1237
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1238
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1239
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1240
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1241
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 126/OpponentCommand.txt b/tests/v1-normal-match/Round 126/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 126/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 126/PlayerCommand.txt b/tests/v1-normal-match/Round 126/PlayerCommand.txt
deleted file mode 100644
index 47076cf..0000000
--- a/tests/v1-normal-match/Round 126/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_RIGHT
diff --git a/tests/v1-normal-match/Round 127/JsonMap.json b/tests/v1-normal-match/Round 127/JsonMap.json
deleted file mode 100644
index 71dddb3..0000000
--- a/tests/v1-normal-match/Round 127/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":127,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":1229
-    },
-    "speed":9,
-    "state":"TURNING_RIGHT",
-    "powerups":[
-      "BOOST",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":1182
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1224
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1225
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1226
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1227
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1228
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1229
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1230
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1231
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1232
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1233
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1234
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1235
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1236
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1237
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1238
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1239
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1240
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1241
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1242
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1243
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1244
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1245
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1246
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1247
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1248
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1249
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1224
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1225
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1226
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1227
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1228
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1229
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1230
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1231
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1232
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1233
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1234
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1235
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1236
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1237
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1238
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1239
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1240
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1241
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1242
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1243
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1244
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1245
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1246
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1247
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1248
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1249
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1224
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1225
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1226
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1227
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1228
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1229
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1230
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1231
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1232
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1233
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1234
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1235
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1236
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1237
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1238
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1239
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1240
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1241
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1242
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1243
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1244
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1245
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1246
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1247
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1248
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1249
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1224
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1225
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1226
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1227
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1228
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1229
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1230
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1231
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1232
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1233
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1234
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1235
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1236
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1237
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1238
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1239
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1240
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1241
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1242
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1243
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1244
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1245
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1246
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1247
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1248
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1249
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 127/OpponentCommand.txt b/tests/v1-normal-match/Round 127/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 127/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 127/PlayerCommand.txt b/tests/v1-normal-match/Round 127/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 127/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 128/JsonMap.json b/tests/v1-normal-match/Round 128/JsonMap.json
deleted file mode 100644
index 0bfc4e8..0000000
--- a/tests/v1-normal-match/Round 128/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":128,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":1244
-    },
-    "speed":9,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":1191
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1239
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1240
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1241
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1242
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1243
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1244
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1245
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1246
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1247
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1248
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1249
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1250
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1251
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1252
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1253
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1254
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1255
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1256
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1257
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1258
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1259
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1260
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1261
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1262
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1263
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1264
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1239
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1240
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1241
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1242
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1243
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1244
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1245
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1246
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1247
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1248
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1249
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1250
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1251
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1252
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1253
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1254
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1255
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1256
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1257
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1258
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1259
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1260
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1261
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1262
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1263
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1264
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1239
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1240
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1241
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1242
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1243
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1244
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1245
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1246
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1247
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1248
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1249
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1250
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1251
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1252
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1253
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1254
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1255
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1256
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1257
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1258
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1259
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1260
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1261
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1262
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1263
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1264
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1239
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1240
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1241
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1242
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1243
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1244
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1245
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1246
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1247
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1248
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1249
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1250
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1251
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1252
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1253
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1254
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1255
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1256
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1257
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1258
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1259
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1260
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1261
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1262
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1263
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1264
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 128/OpponentCommand.txt b/tests/v1-normal-match/Round 128/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 128/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 128/PlayerCommand.txt b/tests/v1-normal-match/Round 128/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 128/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 129/JsonMap.json b/tests/v1-normal-match/Round 129/JsonMap.json
deleted file mode 100644
index f6bc9ce..0000000
--- a/tests/v1-normal-match/Round 129/JsonMap.json
+++ /dev/null
@@ -1,870 +0,0 @@
-{
-  "currentRound":129,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":1259
-    },
-    "speed":3,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":1199
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1254
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1255
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1256
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1257
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1258
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1259
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1260
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1261
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1262
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1263
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1264
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1265
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1266
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1267
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1268
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1269
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1270
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1271
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1272
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1273
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1274
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1275
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1276
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1277
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1278
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1279
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1254
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1255
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1256
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1257
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1258
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1259
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1260
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1261
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1262
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1263
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1264
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1265
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1266
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1267
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1268
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1269
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1270
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1271
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1272
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1273
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1274
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1275
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1276
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1277
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1278
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1279
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1254
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1255
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1256
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1257
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1258
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1259
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1260
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1261
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1262
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1263
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1264
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1265
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1266
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1267
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1268
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1269
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1270
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1271
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1272
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1273
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1274
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1275
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1276
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1277
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1278
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1279
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1254
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1255
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1256
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1257
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1258
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1259
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1260
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1261
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1262
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1263
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1264
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1265
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1266
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1267
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1268
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1269
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1270
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1271
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1272
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1273
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1274
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1275
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1276
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1277
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1278
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1279
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 129/OpponentCommand.txt b/tests/v1-normal-match/Round 129/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 129/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 129/PlayerCommand.txt b/tests/v1-normal-match/Round 129/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 129/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 130/JsonMap.json b/tests/v1-normal-match/Round 130/JsonMap.json
deleted file mode 100644
index 1f046df..0000000
--- a/tests/v1-normal-match/Round 130/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":130,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":1274
-    },
-    "speed":15,
-    "state":"USED_BOOST",
-    "powerups":[
-      "OIL",
-      "OIL"
-    ],
-    "boosting":true,
-    "boostCounter":5
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":1208
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1269
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1270
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1271
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1272
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1273
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1274
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1275
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1276
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1277
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1278
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1279
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1280
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1281
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1282
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1283
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1284
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1285
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1286
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1287
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1288
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1289
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1290
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1292
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1293
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1294
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1269
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1270
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1271
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1272
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1273
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1274
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1275
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1276
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1277
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1278
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1279
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1280
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1281
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1282
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1283
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1284
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1285
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1286
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1287
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1288
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1289
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1290
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1292
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1293
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1294
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1269
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1270
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1271
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1272
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1273
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1274
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1275
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1276
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1277
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1278
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1279
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1280
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1281
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1282
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1283
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1284
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1285
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1286
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1287
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1288
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1289
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1290
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1292
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1293
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1294
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1269
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1270
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1271
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1272
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1273
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1274
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1275
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1276
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1277
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1278
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1279
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1280
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1281
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1282
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1283
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1284
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1285
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1286
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1287
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1288
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1289
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1290
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1292
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1293
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1294
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 130/OpponentCommand.txt b/tests/v1-normal-match/Round 130/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 130/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 130/PlayerCommand.txt b/tests/v1-normal-match/Round 130/PlayerCommand.txt
deleted file mode 100644
index 47076cf..0000000
--- a/tests/v1-normal-match/Round 130/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_RIGHT
diff --git a/tests/v1-normal-match/Round 131/JsonMap.json b/tests/v1-normal-match/Round 131/JsonMap.json
deleted file mode 100644
index 946b8a1..0000000
--- a/tests/v1-normal-match/Round 131/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":131,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":1288
-    },
-    "speed":15,
-    "state":"TURNING_RIGHT",
-    "powerups":[
-      "OIL",
-      "OIL"
-    ],
-    "boosting":true,
-    "boostCounter":4
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":1216
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1283
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1284
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1285
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1286
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1287
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1288
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1289
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1290
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1292
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1293
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1294
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1295
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1296
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1297
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1298
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1299
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1300
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1301
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1302
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1303
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1304
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1305
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1307
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1308
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1283
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1284
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1285
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1286
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1287
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1288
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1289
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1290
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1292
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1293
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1294
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1295
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1296
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1297
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1298
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1299
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1300
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1301
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1302
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1303
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1304
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1305
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1307
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1308
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1283
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1284
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1285
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1286
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1287
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1288
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1289
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1290
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1292
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1293
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1294
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1295
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1296
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1297
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1298
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1299
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1300
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1301
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1302
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1303
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1304
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1305
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1307
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1308
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1283
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1284
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1285
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1286
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1287
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1288
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1289
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1290
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1291
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1292
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1293
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1294
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1295
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1296
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1297
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1298
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1299
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1300
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1301
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1302
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1303
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1304
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1305
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1307
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1308
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 131/OpponentCommand.txt b/tests/v1-normal-match/Round 131/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 131/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 131/PlayerCommand.txt b/tests/v1-normal-match/Round 131/PlayerCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 131/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 132/JsonMap.json b/tests/v1-normal-match/Round 132/JsonMap.json
deleted file mode 100644
index 2c315a4..0000000
--- a/tests/v1-normal-match/Round 132/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":132,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":1302
-    },
-    "speed":9,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL",
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":1225
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1297
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1298
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1299
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1300
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1301
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1302
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1303
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1304
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1305
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1307
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1308
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1310
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1311
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1312
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1313
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1314
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1316
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1318
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1319
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1320
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1322
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1297
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1298
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1299
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1300
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1301
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1302
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1303
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1304
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1305
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1307
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1308
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1310
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1311
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1312
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1313
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1314
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1316
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1318
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1319
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1320
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1322
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1297
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1298
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1299
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1300
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1301
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1302
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1303
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1304
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1305
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1307
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1308
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1310
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1311
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1312
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1313
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1314
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1316
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1318
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1319
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1320
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1322
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1297
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1298
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1299
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1300
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1301
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1302
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1303
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1304
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1305
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1307
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1308
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1310
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1311
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1312
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1313
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1314
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1316
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1318
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1319
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1320
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1322
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 132/OpponentCommand.txt b/tests/v1-normal-match/Round 132/OpponentCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 132/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 132/PlayerCommand.txt b/tests/v1-normal-match/Round 132/PlayerCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 132/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 133/JsonMap.json b/tests/v1-normal-match/Round 133/JsonMap.json
deleted file mode 100644
index 359ab8c..0000000
--- a/tests/v1-normal-match/Round 133/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":133,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":1311
-    },
-    "speed":9,
-    "state":"USED_OIL",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":3,
-      "x":1234
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1307
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1308
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1310
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1311
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1312
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1313
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1314
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1316
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1318
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1319
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1320
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1322
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1323
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1327
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1328
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1330
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1331
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1307
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1308
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1310
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1311
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1312
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1313
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1314
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1316
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1318
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1319
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1320
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1322
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1323
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1327
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1328
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1330
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1331
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1307
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1308
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1310
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1311
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1312
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1313
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1314
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1316
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1318
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1319
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1320
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1322
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1323
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1327
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1328
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1330
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1331
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1306
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1307
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1308
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1309
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1310
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1311
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1312
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1313
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1314
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1316
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1318
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1319
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1320
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1322
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1323
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1327
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1328
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1330
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1331
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 133/OpponentCommand.txt b/tests/v1-normal-match/Round 133/OpponentCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 133/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 133/PlayerCommand.txt b/tests/v1-normal-match/Round 133/PlayerCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 133/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 134/JsonMap.json b/tests/v1-normal-match/Round 134/JsonMap.json
deleted file mode 100644
index 1c9928a..0000000
--- a/tests/v1-normal-match/Round 134/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":134,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":1320
-    },
-    "speed":9,
-    "state":"USED_OIL",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":1242
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1316
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1318
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1319
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1320
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1322
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1323
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1327
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1328
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1330
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1331
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1332
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1334
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1335
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1336
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1337
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1338
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1339
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1340
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1316
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1318
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1319
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1320
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1322
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1323
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1327
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1328
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1330
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1331
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1332
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1334
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1335
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1336
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1337
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1338
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1339
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1340
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1316
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1318
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1319
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1320
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1322
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1323
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1327
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1328
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1330
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1331
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1332
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1334
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1335
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1336
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1337
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1338
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1339
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1340
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1315
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1316
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1317
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1318
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1319
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1320
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1321
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1322
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1323
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1327
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1328
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1330
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1331
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1332
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1334
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1335
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1336
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1337
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1338
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1339
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1340
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 134/OpponentCommand.txt b/tests/v1-normal-match/Round 134/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 134/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 134/PlayerCommand.txt b/tests/v1-normal-match/Round 134/PlayerCommand.txt
deleted file mode 100644
index 1baaf21..0000000
--- a/tests/v1-normal-match/Round 134/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: NOTHING
diff --git a/tests/v1-normal-match/Round 135/JsonMap.json b/tests/v1-normal-match/Round 135/JsonMap.json
deleted file mode 100644
index a1d273d..0000000
--- a/tests/v1-normal-match/Round 135/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":135,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":1329
-    },
-    "speed":9,
-    "state":"NOTHING",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":1257
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1327
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1328
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1330
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1331
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1332
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1334
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1335
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1336
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1337
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1338
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1339
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1340
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1341
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1342
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1343
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1344
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1345
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1346
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1347
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1348
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1349
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1327
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1328
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1330
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1331
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1332
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1334
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1335
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1336
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1337
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1338
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1339
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1340
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1341
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1342
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1343
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1344
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1345
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1346
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1347
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1348
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1349
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1327
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1328
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1330
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1331
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1332
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1334
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1335
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1336
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1337
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1338
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1339
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1340
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1341
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1342
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1343
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1344
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1345
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1346
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1347
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1348
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1349
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1324
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1325
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1326
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1327
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1328
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1329
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1330
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1331
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1332
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1334
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1335
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1336
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1337
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1338
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1339
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1340
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1341
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1342
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1343
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1344
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1345
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1346
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1347
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1348
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1349
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 135/OpponentCommand.txt b/tests/v1-normal-match/Round 135/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 135/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 135/PlayerCommand.txt b/tests/v1-normal-match/Round 135/PlayerCommand.txt
deleted file mode 100644
index 1baaf21..0000000
--- a/tests/v1-normal-match/Round 135/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: NOTHING
diff --git a/tests/v1-normal-match/Round 136/JsonMap.json b/tests/v1-normal-match/Round 136/JsonMap.json
deleted file mode 100644
index a438584..0000000
--- a/tests/v1-normal-match/Round 136/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":136,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":1338
-    },
-    "speed":9,
-    "state":"NOTHING",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":1272
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1334
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1335
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1336
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1337
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1338
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1339
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1340
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1341
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1342
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1343
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1344
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1345
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1346
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1347
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1348
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1349
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1350
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1351
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1352
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1353
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1354
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1355
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1356
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1357
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1358
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1334
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1335
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1336
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1337
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1338
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1339
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1340
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1341
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1342
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1343
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1344
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1345
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1346
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1347
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1348
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1349
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1350
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1351
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1352
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1353
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1354
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1355
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1356
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1357
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1358
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1334
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1335
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1336
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1337
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1338
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1339
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1340
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1341
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1342
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1343
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1344
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1345
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1346
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1347
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1348
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1349
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1350
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1351
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1352
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1353
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1354
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1355
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1356
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1357
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1358
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1333
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1334
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1335
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1336
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1337
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1338
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1339
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1340
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1341
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1342
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1343
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1344
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1345
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1346
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1347
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1348
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1349
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1350
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1351
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1352
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1353
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1354
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1355
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1356
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1357
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1358
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 136/OpponentCommand.txt b/tests/v1-normal-match/Round 136/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 136/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 136/PlayerCommand.txt b/tests/v1-normal-match/Round 136/PlayerCommand.txt
deleted file mode 100644
index 1baaf21..0000000
--- a/tests/v1-normal-match/Round 136/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: NOTHING
diff --git a/tests/v1-normal-match/Round 137/JsonMap.json b/tests/v1-normal-match/Round 137/JsonMap.json
deleted file mode 100644
index fd94195..0000000
--- a/tests/v1-normal-match/Round 137/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":137,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":1347
-    },
-    "speed":6,
-    "state":"HIT_MUD",
-    "powerups":[
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":1287
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1342
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1343
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1344
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1345
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1346
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1347
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1348
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1349
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1350
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1351
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1352
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1353
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1354
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1355
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1356
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1357
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1358
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1359
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1360
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1361
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1362
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1363
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1364
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1367
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1342
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1343
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1344
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1345
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1346
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1347
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1348
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1349
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1350
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1351
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1352
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1353
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1354
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1355
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1356
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1357
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1358
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1359
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1360
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1361
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1362
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1363
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1364
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1367
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1342
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1343
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1344
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1345
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1346
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1347
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1348
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1349
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1350
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1351
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1352
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1353
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1354
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1355
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1356
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1357
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1358
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1359
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1360
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1361
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1362
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1363
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1364
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1367
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1342
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1343
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1344
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1345
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1346
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1347
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1348
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1349
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1350
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1351
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1352
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1353
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1354
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1355
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1356
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1357
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1358
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1359
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1360
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1361
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1362
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1363
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1364
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1367
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 137/OpponentCommand.txt b/tests/v1-normal-match/Round 137/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 137/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 137/PlayerCommand.txt b/tests/v1-normal-match/Round 137/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 137/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 138/JsonMap.json b/tests/v1-normal-match/Round 138/JsonMap.json
deleted file mode 100644
index 06323e2..0000000
--- a/tests/v1-normal-match/Round 138/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":138,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":1362
-    },
-    "speed":9,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":1296
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1357
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1358
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1359
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1360
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1361
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1362
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1363
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1364
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1367
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1368
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1369
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1370
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1371
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1372
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1373
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1374
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1375
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1376
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1377
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1378
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1379
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1380
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1381
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1382
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1357
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1358
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1359
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1360
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1361
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1362
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1363
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1364
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1367
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1368
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1369
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1370
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1371
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1372
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1373
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1374
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1375
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1376
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1377
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1378
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1379
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1380
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1381
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1382
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1357
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1358
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1359
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1360
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1361
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1362
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1363
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1364
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1367
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1368
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1369
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1370
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1371
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1372
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1373
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1374
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1375
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1376
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1377
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1378
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1379
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1380
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1381
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1382
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1357
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1358
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1359
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1360
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1361
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1362
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1363
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1364
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1367
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1368
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1369
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1370
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1371
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1372
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1373
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1374
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1375
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1376
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1377
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1378
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1379
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1380
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1381
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1382
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 138/OpponentCommand.txt b/tests/v1-normal-match/Round 138/OpponentCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 138/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 138/PlayerCommand.txt b/tests/v1-normal-match/Round 138/PlayerCommand.txt
deleted file mode 100644
index 47076cf..0000000
--- a/tests/v1-normal-match/Round 138/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_RIGHT
diff --git a/tests/v1-normal-match/Round 139/JsonMap.json b/tests/v1-normal-match/Round 139/JsonMap.json
deleted file mode 100644
index 3f0f0e2..0000000
--- a/tests/v1-normal-match/Round 139/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":139,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":1370
-    },
-    "speed":9,
-    "state":"TURNING_RIGHT",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":1,
-      "x":1304
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1367
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1368
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1369
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1370
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1371
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1372
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1373
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1374
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1375
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1376
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1377
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1378
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1379
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1380
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1381
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1382
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1383
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1384
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1385
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1386
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1387
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1388
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1389
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1390
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1367
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1368
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1369
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1370
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1371
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1372
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1373
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1374
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1375
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1376
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1377
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1378
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1379
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1380
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1381
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1382
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1383
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1384
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1385
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1386
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1387
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1388
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1389
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1390
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1367
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1368
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1369
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1370
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1371
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1372
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1373
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1374
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1375
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1376
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1377
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1378
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1379
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1380
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1381
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1382
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1383
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1384
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1385
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1386
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1387
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1388
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1389
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1390
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1365
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1366
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1367
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1368
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1369
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1370
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1371
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1372
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1373
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1374
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1375
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1376
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1377
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1378
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1379
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1380
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1381
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1382
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1383
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1384
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1385
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1386
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1387
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1388
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1389
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1390
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 139/OpponentCommand.txt b/tests/v1-normal-match/Round 139/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 139/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 139/PlayerCommand.txt b/tests/v1-normal-match/Round 139/PlayerCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 139/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 140/JsonMap.json b/tests/v1-normal-match/Round 140/JsonMap.json
deleted file mode 100644
index 3f31bb7..0000000
--- a/tests/v1-normal-match/Round 140/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":140,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":1379
-    },
-    "speed":9,
-    "state":"USED_OIL",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":1,
-      "x":1313
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1374
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1375
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1376
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1377
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1378
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1379
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1380
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1381
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1382
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1383
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1384
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1385
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1386
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1387
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1388
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1389
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1390
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1391
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1392
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1393
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1394
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1395
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1396
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1398
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1399
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1374
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1375
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1376
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1377
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1378
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1379
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1380
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1381
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1382
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1383
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1384
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1385
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1386
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1387
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1388
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1389
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1390
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1391
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1392
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1393
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1394
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1395
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1396
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1398
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1399
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1374
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1375
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1376
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1377
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1378
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1379
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1380
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1381
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1382
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1383
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1384
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1385
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1386
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1387
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1388
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1389
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1390
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1391
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1392
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1393
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1394
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1395
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1396
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1398
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1399
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1374
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1375
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1376
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1377
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1378
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1379
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1380
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1381
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1382
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1383
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1384
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1385
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1386
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1387
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1388
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1389
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1390
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1391
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1392
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1393
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1394
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1395
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1396
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1398
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1399
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 140/OpponentCommand.txt b/tests/v1-normal-match/Round 140/OpponentCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 140/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 140/PlayerCommand.txt b/tests/v1-normal-match/Round 140/PlayerCommand.txt
deleted file mode 100644
index 1baaf21..0000000
--- a/tests/v1-normal-match/Round 140/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: NOTHING
diff --git a/tests/v1-normal-match/Round 141/JsonMap.json b/tests/v1-normal-match/Round 141/JsonMap.json
deleted file mode 100644
index b61ab9d..0000000
--- a/tests/v1-normal-match/Round 141/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":141,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":1388
-    },
-    "speed":8,
-    "state":"HIT_MUD",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":1,
-      "x":1322
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1383
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1384
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1385
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1386
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1387
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1388
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1389
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1390
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1391
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1392
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1393
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1394
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1395
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1396
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1398
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1399
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1400
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1401
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1402
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1403
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1406
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1407
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1383
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1384
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1385
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1386
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1387
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1388
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1389
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1390
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1391
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1392
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1393
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1394
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1395
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1396
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1398
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1399
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1400
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1401
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1402
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1403
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1406
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1407
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1383
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1384
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1385
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1386
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1387
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1388
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1389
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1390
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1391
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1392
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1393
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1394
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1395
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1396
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1398
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1399
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1400
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1401
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1402
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1403
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1406
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1407
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1383
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1384
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1385
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1386
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1387
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1388
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1389
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1390
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1391
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1392
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1393
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1394
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1395
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1396
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1398
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1399
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1400
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1401
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1402
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1403
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1406
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1407
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 141/OpponentCommand.txt b/tests/v1-normal-match/Round 141/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 141/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 141/PlayerCommand.txt b/tests/v1-normal-match/Round 141/PlayerCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 141/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 142/JsonMap.json b/tests/v1-normal-match/Round 142/JsonMap.json
deleted file mode 100644
index b908eb4..0000000
--- a/tests/v1-normal-match/Round 142/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":142,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":1395
-    },
-    "speed":3,
-    "state":"HIT_MUD",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":1,
-      "x":1331
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1390
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1391
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1392
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1393
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1394
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1395
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1396
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1398
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1399
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1400
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1401
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1402
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1403
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1406
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1407
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1409
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1410
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1411
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1413
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1414
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1390
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1391
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1392
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1393
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1394
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1395
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1396
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1398
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1399
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1400
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1401
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1402
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1403
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1406
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1407
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1409
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1410
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1411
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1413
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1414
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1390
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1391
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1392
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1393
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1394
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1395
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1396
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1398
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1399
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1400
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1401
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1402
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1403
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1406
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1407
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1409
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1410
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1411
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1413
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1414
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1390
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1391
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1392
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1393
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1394
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1395
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1396
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1398
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1399
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1400
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1401
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1402
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1403
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1406
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1407
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1409
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1410
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1411
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1413
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1414
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 142/OpponentCommand.txt b/tests/v1-normal-match/Round 142/OpponentCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 142/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 142/PlayerCommand.txt b/tests/v1-normal-match/Round 142/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 142/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 143/JsonMap.json b/tests/v1-normal-match/Round 143/JsonMap.json
deleted file mode 100644
index 00d1158..0000000
--- a/tests/v1-normal-match/Round 143/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":143,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":1401
-    },
-    "speed":3,
-    "state":"HIT_MUD",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":1,
-      "x":1340
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1396
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1398
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1399
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1400
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1401
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1402
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1403
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1406
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1407
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1409
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1410
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1411
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1413
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1414
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1416
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1418
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1396
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1398
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1399
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1400
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1401
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1402
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1403
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1406
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1407
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1409
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1410
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1411
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1413
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1414
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1416
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1418
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1396
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1398
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1399
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1400
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1401
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1402
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1403
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1406
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1407
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1409
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1410
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1411
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1413
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1414
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1416
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1418
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1396
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1397
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1398
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1399
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1400
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1401
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1402
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1403
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1406
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1407
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1409
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1410
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1411
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1413
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1414
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1416
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1418
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 143/OpponentCommand.txt b/tests/v1-normal-match/Round 143/OpponentCommand.txt
deleted file mode 100644
index 47076cf..0000000
--- a/tests/v1-normal-match/Round 143/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_RIGHT
diff --git a/tests/v1-normal-match/Round 143/PlayerCommand.txt b/tests/v1-normal-match/Round 143/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 143/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 144/JsonMap.json b/tests/v1-normal-match/Round 144/JsonMap.json
deleted file mode 100644
index c709902..0000000
--- a/tests/v1-normal-match/Round 144/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":144,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":1407
-    },
-    "speed":3,
-    "state":"HIT_MUD",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":1348
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1402
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1403
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1406
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1407
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1409
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1410
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1411
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1413
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1414
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1416
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1418
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1422
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1423
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1424
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1425
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1426
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1427
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1402
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1403
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1406
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1407
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1409
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1410
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1411
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1413
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1414
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1416
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1418
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1422
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1423
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1424
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1425
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1426
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1427
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1402
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1403
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1406
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1407
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1409
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1410
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1411
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1413
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1414
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1416
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1418
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1422
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1423
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1424
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1425
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1426
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1427
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1402
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1403
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1404
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1405
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1406
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1407
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1409
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1410
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1411
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1413
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1414
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1416
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1418
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1422
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1423
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1424
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1425
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1426
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1427
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 144/OpponentCommand.txt b/tests/v1-normal-match/Round 144/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 144/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 144/PlayerCommand.txt b/tests/v1-normal-match/Round 144/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 144/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 145/JsonMap.json b/tests/v1-normal-match/Round 145/JsonMap.json
deleted file mode 100644
index 679fd65..0000000
--- a/tests/v1-normal-match/Round 145/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":145,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":1413
-    },
-    "speed":3,
-    "state":"HIT_MUD",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":1363
-    },
-    "speed":9
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1409
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1410
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1411
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1413
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1414
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1416
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1418
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1422
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1423
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1424
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1425
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1426
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1427
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1428
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1429
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1430
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1431
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1432
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1433
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1409
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1410
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1411
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1413
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1414
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1416
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1418
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1422
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1423
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1424
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1425
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1426
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1427
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1428
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1429
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1430
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1431
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1432
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1433
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1409
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1410
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1411
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1413
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1414
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1416
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1418
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1422
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1423
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1424
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1425
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1426
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1427
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1428
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1429
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1430
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1431
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1432
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1433
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1408
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1409
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1410
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1411
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1412
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1413
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1414
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1416
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1418
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1422
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1423
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1424
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1425
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1426
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1427
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1428
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1429
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1430
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1431
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1432
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1433
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 145/OpponentCommand.txt b/tests/v1-normal-match/Round 145/OpponentCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 145/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 145/PlayerCommand.txt b/tests/v1-normal-match/Round 145/PlayerCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 145/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 146/JsonMap.json b/tests/v1-normal-match/Round 146/JsonMap.json
deleted file mode 100644
index 415ee15..0000000
--- a/tests/v1-normal-match/Round 146/JsonMap.json
+++ /dev/null
@@ -1,866 +0,0 @@
-{
-  "currentRound":146,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":1419
-    },
-    "speed":6,
-    "state":"ACCELERATING",
-    "powerups":[],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":1372
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1414
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1416
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1418
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1422
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1423
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1424
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1425
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1426
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1427
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1428
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1429
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1430
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1431
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1432
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1433
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1434
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1435
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1436
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1437
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1438
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1439
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1414
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1416
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1418
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1422
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1423
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1424
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1425
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1426
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1427
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1428
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1429
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1430
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1431
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1432
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1433
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1434
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1435
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1436
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1437
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1438
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1439
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1414
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1416
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1418
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1422
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1423
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1424
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1425
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1426
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1427
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1428
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1429
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1430
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1431
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1432
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1433
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1434
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1435
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1436
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1437
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1438
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1439
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1414
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1415
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1416
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1417
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1418
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1422
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1423
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1424
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1425
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1426
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1427
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1428
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1429
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1430
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1431
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1432
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1433
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1434
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1435
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1436
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1437
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1438
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1439
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 146/OpponentCommand.txt b/tests/v1-normal-match/Round 146/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 146/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 146/PlayerCommand.txt b/tests/v1-normal-match/Round 146/PlayerCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 146/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 147/JsonMap.json b/tests/v1-normal-match/Round 147/JsonMap.json
deleted file mode 100644
index 984cce6..0000000
--- a/tests/v1-normal-match/Round 147/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":147,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1424
-    },
-    "speed":6,
-    "state":"TURNING_LEFT",
-    "powerups":[
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":1381
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1422
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1423
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1424
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1425
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1426
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1427
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1428
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1429
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1430
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1431
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1432
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1433
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1434
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1435
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1436
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1437
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1438
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1439
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1440
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1441
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1442
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1443
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1444
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1422
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1423
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1424
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1425
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1426
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1427
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1428
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1429
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1430
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1431
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1432
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1433
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1434
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1435
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1436
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1437
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1438
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1439
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1440
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1441
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1442
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1443
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1444
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1422
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1423
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1424
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1425
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1426
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1427
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1428
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1429
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1430
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1431
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1432
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1433
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1434
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1435
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1436
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1437
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1438
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1439
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1440
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1441
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1442
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1443
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1444
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1419
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1420
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1421
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1422
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1423
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1424
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1425
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1426
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1427
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1428
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1429
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1430
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1431
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1432
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1433
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1434
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1435
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1436
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1437
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1438
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1439
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1440
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1441
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1442
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1443
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1444
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 147/OpponentCommand.txt b/tests/v1-normal-match/Round 147/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 147/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 147/PlayerCommand.txt b/tests/v1-normal-match/Round 147/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 147/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 148/JsonMap.json b/tests/v1-normal-match/Round 148/JsonMap.json
deleted file mode 100644
index 9eff832..0000000
--- a/tests/v1-normal-match/Round 148/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":148,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1439
-    },
-    "speed":15,
-    "state":"USED_BOOST",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":true,
-    "boostCounter":5
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":1390
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1434
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1435
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1436
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1437
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1438
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1439
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1440
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1441
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1442
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1443
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1444
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1445
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1446
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1447
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1448
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1449
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1450
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1451
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1452
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1453
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1454
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1455
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1456
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1457
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1458
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1459
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1434
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1435
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1436
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1437
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1438
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1439
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1440
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1441
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1442
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1443
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1444
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1445
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1446
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1447
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1448
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1449
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1450
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1451
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1452
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1453
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1454
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1455
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1456
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1457
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1458
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1459
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1434
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1435
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1436
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1437
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1438
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1439
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1440
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1441
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1442
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1443
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1444
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1445
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1446
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1447
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1448
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1449
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1450
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1451
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1452
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1453
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1454
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1455
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1456
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1457
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1458
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1459
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1434
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1435
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1436
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1437
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1438
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1439
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1440
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1441
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1442
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1443
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1444
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1445
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1446
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1447
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1448
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1449
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1450
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1451
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1452
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1453
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1454
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1455
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1456
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1457
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1458
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1459
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 148/OpponentCommand.txt b/tests/v1-normal-match/Round 148/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 148/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 148/PlayerCommand.txt b/tests/v1-normal-match/Round 148/PlayerCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 148/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 149/JsonMap.json b/tests/v1-normal-match/Round 149/JsonMap.json
deleted file mode 100644
index 9bd7491..0000000
--- a/tests/v1-normal-match/Round 149/JsonMap.json
+++ /dev/null
@@ -1,868 +0,0 @@
-{
-  "currentRound":149,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":1,
-      "x":1453
-    },
-    "speed":15,
-    "state":"TURNING_LEFT",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":true,
-    "boostCounter":4
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":1405
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1448
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1449
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1450
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1451
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1452
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1453
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1454
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1455
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1456
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1457
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1458
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1459
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1460
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1461
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1462
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1463
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1464
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1465
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1466
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1467
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1468
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1469
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1470
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1471
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1472
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1473
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1448
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1449
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1450
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1451
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1452
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1453
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1454
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1455
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1456
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1457
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1458
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1459
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1460
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1461
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1462
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1463
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1464
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1465
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1466
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1467
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1468
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1469
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1470
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1471
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1472
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1473
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1448
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1449
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1450
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1451
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1452
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1453
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1454
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1455
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1456
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1457
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1458
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1459
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1460
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1461
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1462
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1463
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1464
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1465
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1466
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1467
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1468
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1469
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1470
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1471
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1472
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1473
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1448
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1449
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1450
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1451
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1452
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1453
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1454
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1455
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1456
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1457
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1458
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1459
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1460
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1461
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1462
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1463
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1464
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1465
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1466
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1467
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1468
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1469
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1470
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1471
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1472
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1473
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 149/OpponentCommand.txt b/tests/v1-normal-match/Round 149/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 149/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 149/PlayerCommand.txt b/tests/v1-normal-match/Round 149/PlayerCommand.txt
deleted file mode 100644
index 47076cf..0000000
--- a/tests/v1-normal-match/Round 149/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_RIGHT
diff --git a/tests/v1-normal-match/Round 150/JsonMap.json b/tests/v1-normal-match/Round 150/JsonMap.json
deleted file mode 100644
index 9f2cb63..0000000
--- a/tests/v1-normal-match/Round 150/JsonMap.json
+++ /dev/null
@@ -1,869 +0,0 @@
-{
-  "currentRound":150,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":1467
-    },
-    "speed":15,
-    "state":"TURNING_RIGHT",
-    "powerups":[
-      "OIL",
-      "OIL"
-    ],
-    "boosting":true,
-    "boostCounter":3
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":1414
-    },
-    "speed":6
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1462
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1463
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1464
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1465
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1466
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1467
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1468
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1469
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1470
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1471
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1472
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1473
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1474
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1475
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1476
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1477
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1478
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1479
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1480
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1481
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1482
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1483
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1484
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1485
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1486
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1462
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1463
-        },
-        "surfaceObject":3,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1464
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1465
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1466
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1467
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1468
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1469
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1470
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1471
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1472
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1473
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1474
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1475
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1476
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1477
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1478
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1479
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1480
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1481
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1482
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1483
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1484
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1485
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1486
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1462
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1463
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1464
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1465
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1466
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1467
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1468
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1469
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1470
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1471
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1472
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1473
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1474
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1475
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1476
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1477
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1478
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1479
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1480
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1481
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1482
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1483
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1484
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1485
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1486
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1462
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1463
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1464
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1465
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1466
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1467
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1468
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1469
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1470
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1471
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1472
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1473
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1474
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1475
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1476
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1477
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1478
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1479
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1480
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1481
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1482
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1483
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1484
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1485
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1486
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 150/OpponentCommand.txt b/tests/v1-normal-match/Round 150/OpponentCommand.txt
deleted file mode 100644
index 8ef4270..0000000
--- a/tests/v1-normal-match/Round 150/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: ACCELERATE
diff --git a/tests/v1-normal-match/Round 150/PlayerCommand.txt b/tests/v1-normal-match/Round 150/PlayerCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 150/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 151/JsonMap.json b/tests/v1-normal-match/Round 151/JsonMap.json
deleted file mode 100644
index be00146..0000000
--- a/tests/v1-normal-match/Round 151/JsonMap.json
+++ /dev/null
@@ -1,804 +0,0 @@
-{
-  "currentRound":151,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":2,
-      "x":1482
-    },
-    "speed":9,
-    "state":"HIT_MUD",
-    "powerups":[
-      "OIL"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":2,
-      "x":1422
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1477
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1478
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1479
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1480
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1481
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1482
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1483
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1484
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1485
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1486
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1488
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1489
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1490
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1491
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1492
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1493
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1494
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1495
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1496
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1497
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1500
-        },
-        "surfaceObject":4,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1477
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1478
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1479
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1480
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1481
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1482
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1483
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1484
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1485
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1486
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1488
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1489
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1490
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1491
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1492
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1493
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1494
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1495
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1496
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1497
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1500
-        },
-        "surfaceObject":4,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1477
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1478
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1479
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1480
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1481
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1482
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1483
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1484
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1485
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1486
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1488
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1489
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1490
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1491
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1492
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1493
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1494
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1495
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1496
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1497
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1500
-        },
-        "surfaceObject":4,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1477
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1478
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1479
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1480
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1481
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1482
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1483
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1484
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1485
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1486
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1488
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1489
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1490
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1491
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1492
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1493
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1494
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1495
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1496
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1497
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1500
-        },
-        "surfaceObject":4,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 151/OpponentCommand.txt b/tests/v1-normal-match/Round 151/OpponentCommand.txt
deleted file mode 100644
index 46ca975..0000000
--- a/tests/v1-normal-match/Round 151/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_LEFT
diff --git a/tests/v1-normal-match/Round 151/PlayerCommand.txt b/tests/v1-normal-match/Round 151/PlayerCommand.txt
deleted file mode 100644
index 47076cf..0000000
--- a/tests/v1-normal-match/Round 151/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_RIGHT
diff --git a/tests/v1-normal-match/Round 152/JsonMap.json b/tests/v1-normal-match/Round 152/JsonMap.json
deleted file mode 100644
index b39eeb6..0000000
--- a/tests/v1-normal-match/Round 152/JsonMap.json
+++ /dev/null
@@ -1,549 +0,0 @@
-{
-  "currentRound":152,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":1490
-    },
-    "speed":9,
-    "state":"TURNING_RIGHT",
-    "powerups":[
-      "OIL",
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":1,
-      "x":1429
-    },
-    "speed":8
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1485
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1486
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1488
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1489
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1490
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1491
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1492
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1493
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1494
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1495
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1496
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1497
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1500
-        },
-        "surfaceObject":4,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1485
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1486
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1488
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1489
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1490
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1491
-        },
-        "surfaceObject":1,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1492
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1493
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1494
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1495
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1496
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1497
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1500
-        },
-        "surfaceObject":4,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1485
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1486
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1488
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1489
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1490
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1491
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1492
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1493
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1494
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1495
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1496
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1497
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1500
-        },
-        "surfaceObject":4,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1485
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1486
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1487
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1488
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1489
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1490
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1491
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1492
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1493
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1494
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1495
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1496
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1497
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1500
-        },
-        "surfaceObject":4,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 152/OpponentCommand.txt b/tests/v1-normal-match/Round 152/OpponentCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 152/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST
diff --git a/tests/v1-normal-match/Round 152/PlayerCommand.txt b/tests/v1-normal-match/Round 152/PlayerCommand.txt
deleted file mode 100644
index 0d0ef99..0000000
--- a/tests/v1-normal-match/Round 152/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_OIL
diff --git a/tests/v1-normal-match/Round 153/JsonMap.json b/tests/v1-normal-match/Round 153/JsonMap.json
deleted file mode 100644
index 3f6189e..0000000
--- a/tests/v1-normal-match/Round 153/JsonMap.json
+++ /dev/null
@@ -1,260 +0,0 @@
-{
-  "currentRound":153,
-  "maxRounds":600,
-  "player":{
-    "id":1,
-    "position":{
-      "y":3,
-      "x":1499
-    },
-    "speed":9,
-    "state":"USED_OIL",
-    "powerups":[
-      "BOOST"
-    ],
-    "boosting":false,
-    "boostCounter":0
-  },
-  "opponent":{
-    "id":2,
-    "position":{
-      "y":1,
-      "x":1444
-    },
-    "speed":15
-  },
-  "worldMap":[
-    [
-      {
-        "position":{
-          "y":1,
-          "x":1494
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1495
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1496
-        },
-        "surfaceObject":5,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1497
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":1,
-          "x":1500
-        },
-        "surfaceObject":4,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":2,
-          "x":1494
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1495
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1496
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1497
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":2,
-          "x":1500
-        },
-        "surfaceObject":4,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":3,
-          "x":1494
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1495
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1496
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1497
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":1
-      },
-      {
-        "position":{
-          "y":3,
-          "x":1500
-        },
-        "surfaceObject":4,
-        "occupiedByPlayerId":0
-      }
-    ],
-    [
-      {
-        "position":{
-          "y":4,
-          "x":1494
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1495
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1496
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1497
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1498
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1499
-        },
-        "surfaceObject":0,
-        "occupiedByPlayerId":0
-      },
-      {
-        "position":{
-          "y":4,
-          "x":1500
-        },
-        "surfaceObject":4,
-        "occupiedByPlayerId":0
-      }
-    ]
-  ]
-}
\ No newline at end of file
diff --git a/tests/v1-normal-match/Round 153/OpponentCommand.txt b/tests/v1-normal-match/Round 153/OpponentCommand.txt
deleted file mode 100644
index 47076cf..0000000
--- a/tests/v1-normal-match/Round 153/OpponentCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: TURN_RIGHT
diff --git a/tests/v1-normal-match/Round 153/PlayerCommand.txt b/tests/v1-normal-match/Round 153/PlayerCommand.txt
deleted file mode 100644
index 32cf195..0000000
--- a/tests/v1-normal-match/Round 153/PlayerCommand.txt
+++ /dev/null
@@ -1 +0,0 @@
-Command: USE_BOOST