diff --git a/pelita/layout.py b/pelita/layout.py
index e5797adc..66fa2ebd 100644
--- a/pelita/layout.py
+++ b/pelita/layout.py
@@ -545,9 +545,9 @@ def layout_for_team(layout, is_blue=True, is_noisy=(False, False)):
         'is_noisy' : is_noisy,
     }
 
-def layout_agnostic(layout_for_team, is_blue=True):
-    """ Converts a layout dict with 2 bots and enemies to a layout
-    with 4 bots.
+def layout_agnostic(layout, is_blue=True):
+    """ Converts a layout dict with 2 bots and enemies (team-style)
+    to a layout with 4 bots (server-style).
     """
     if "enemy" not in layout:
         raise ValueError("Layout is already in server-style.")

diff --git a/test/test_layout.py b/test/test_layout.py
index ff30905a..4d3d8638 100644
--- a/test/test_layout.py
+++ b/test/test_layout.py
@@ -454,3 +454,38 @@ def test_layout_for_team():
 
     with pytest.raises(ValueError):
         layout_for_team(parse_layout(red1))
+
+def test_layout_agnostic():
+    """
+    Test if team-style layout can be converted to server-style layout.
+    
+    Uses this layout:
+
+    ####
+    #01#
+    #EE#
+    #..#
+    ####
+    """
+
+    l = {
+        'walls': [(0,0),(0,1),(0,2),(0,3),(1,0),(1,3),(2,0),(2,3),(3,0),(3,3),(4,0),(4,1),(4,2),(4,3)],
+        'food': [(3,1),(3,2)],
+        'bots': [(1,1),(1,2)],
+        'enemy': [(2,1),(2,2)]
+        }
+
+
+    l_expected_blue = {
+        'walls': [(0,0),(0,1),(0,2),(0,3),(1,0),(1,3),(2,0),(2,3),(3,0),(3,3),(4,0),(4,1),(4,2),(4,3)],
+        'food': [(3,1),(3,2)],
+        'bots': [(1,1),(2,1),(1,2),(2,2)]
+        }
+    l_expected_red = {
+        'walls': [(0,0),(0,1),(0,2),(0,3),(1,0),(1,3),(2,0),(2,3),(3,0),(3,3),(4,0),(4,1),(4,2),(4,3)],
+        'food': [(3,1),(3,2)],
+        'bots': [(2,1),(1,1),(2,2),(1,2)]
+        }
+
+    assert layout_agnostic(l, is_blue=True) == l_expected_blue
+    assert layout_agnostic(l, is_blue=False) == l_expected_red

layout_agnostic needs tests and fixes
Currently broken. https://github.com/ASPP/pelita/blob/2f17db5355b4dffae8a130ede549ab869b2f1ce2/pelita/layout.py#L548-L566

test/test_layout.py::test_layout_agnostic
test/test_layout.py::test_get_available_layouts test/test_layout.py::test_get_layout_by_name test/test_layout.py::test_get_random_layout test/test_layout.py::test_get_random_layout_returns_correct_layout test/test_layout.py::test_not_enclosed_by_walls test/test_layout.py::test_illegal_character test/test_layout.py::test_illegal_index test/test_layout.py::test_illegal_walls test/test_layout.py::test_illegal_width test/test_layout.py::test_different_width test/test_layout.py::test_combined_layouts test/test_layout.py::test_combined_layouts_empty_lines test/test_layout.py::test_duplicate_bots_forbidden test/test_layout.py::test_duplicate_bots_allowed test/test_layout.py::test_combined_layouts_broken_lines test/test_layout.py::test_roundtrip test/test_layout.py::test_roundtrip_overlapping test/test_layout.py::test_empty_lines test/test_layout.py::test_equal_positions test/test_layout.py::test_legal_positions[pos0-legal_positions0] test/test_layout.py::test_legal_positions[pos1-legal_positions1] test/test_layout.py::test_legal_positions[pos2-legal_positions2] test/test_layout.py::test_legal_positions[pos3-legal_positions3] test/test_layout.py::test_legal_positions_fail[pos0] test/test_layout.py::test_legal_positions_fail[pos1] test/test_layout.py::test_legal_positions_fail[pos2] test/test_layout.py::test_legal_positions_fail[pos3] test/test_layout.py::test_legal_positions_fail[pos4] test/test_layout.py::test_enemy_raises test/test_layout.py::test_enemy_positions[\n test/test_layout.py::test_layout_for_team