diff --git a/fh.fd.ci.client/src/test/java/de/fd/fh/FigureFarmerTest.java b/fh.fd.ci.client/src/test/java/de/fd/fh/FigureFarmerTest.java
new file mode 100644
index 0000000..1405b85
--- /dev/null
+++ b/fh.fd.ci.client/src/test/java/de/fd/fh/FigureFarmerTest.java
@@ -0,0 +1,44 @@
+package de.fd.fh;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class FigureFarmerTest
+{
+    // weißer Bauer
+    @Test
+    void whiteFarmerValidDestination()
+    {
+        Figure f = new FigureFarmer();
+        assertTrue(f.moveAllowed(Figure.fieldLength * 6 + 0, Figure.fieldLength * 5 + 0, new int[Figure.fieldLength * Figure.fieldLength]));
+    }
+
+    @Test
+    void whiteFarmerInvalidDestinationDown() // statt nach "oben" wird nach "unten" gegangen
+    {
+        Figure f = new FigureFarmer();
+        assertFalse(f.moveAllowed(Figure.fieldLength * 6 + 0, Figure.fieldLength * 7 + 0, new int[Figure.fieldLength * Figure.fieldLength]));
+    }
+
+    @Test
+    void whiteFarmerInvalidDestinationUp() // mehr als 1 Schritt nach "oben"
+    {
+        Figure f = new FigureFarmer();
+        assertFalse(f.moveAllowed(Figure.fieldLength * 6 + 0, Figure.fieldLength * 4 + 0, new int[Figure.fieldLength * Figure.fieldLength]));
+    }
+
+    @Test
+    void checkMoveWithValidDestinationVar2() // Bauer (w) steht in der Mitte vom Feld und geht 1 nach oben
+    {
+        Figure f = new FigureFarmer();
+        assertTrue(f.moveAllowed(Figure.fieldLength * 4 + 4, Figure.fieldLength * 3 + 4, new int[Figure.fieldLength * Figure.fieldLength]));
+    }
+
+    @Test
+    void whiteFarmerInvalidDestinationDownVar2() // Bauer (w) steht in der Mitte vom Feld und geht 1 nach unten
+    {
+        Figure f = new FigureFarmer();
+        assertFalse(f.moveAllowed(Figure.fieldLength * 4 + 4, Figure.fieldLength * 5 + 4, new int[Figure.fieldLength * Figure.fieldLength]));
+    }
+}
\ No newline at end of file
diff --git a/fh.fd.ci.client/src/test/java/de/fd/fh/FigureTest.java b/fh.fd.ci.client/src/test/java/de/fd/fh/FigureTest.java
index 7320505..901564e 100644
--- a/fh.fd.ci.client/src/test/java/de/fd/fh/FigureTest.java
+++ b/fh.fd.ci.client/src/test/java/de/fd/fh/FigureTest.java
@@ -34,42 +34,6 @@ class FigureTest
         assertFalse(f.moveAllowed(Figure.fieldLength * 6 + 0, Figure.fieldLength * 6 + 0, new int[Figure.fieldLength * Figure.fieldLength]));
     }
 
-    // weißer Bauer
-    @Test
-    void checkMoveWithValidDestination()
-    {
-        Figure f = new FigureFarmer();
-        assertTrue(f.moveAllowed(Figure.fieldLength * 6 + 0, Figure.fieldLength * 5 + 0, new int[Figure.fieldLength * Figure.fieldLength]));
-    }
-
-    @Test
-    void whiteFarmerInvalidDestinationDown() // statt nach "oben" wird nach "unten" gegangen
-    {
-        Figure f = new FigureFarmer();
-        assertFalse(f.moveAllowed(Figure.fieldLength * 6 + 0, Figure.fieldLength * 7 + 0, new int[Figure.fieldLength * Figure.fieldLength]));
-    }
-
-    @Test
-    void whiteFarmerInvalidDestinationUp() // mehr als 1 Schritt nach "oben"
-    {
-        Figure f = new FigureFarmer();
-        assertFalse(f.moveAllowed(Figure.fieldLength * 6 + 0, Figure.fieldLength * 4 + 0, new int[Figure.fieldLength * Figure.fieldLength]));
-    }
-
-    @Test
-    void checkMoveWithValidDestinationVar2() // Bauer (w) steht in der Mitte vom Feld und geht 1 nach oben
-    {
-        Figure f = new FigureFarmer();
-        assertTrue(f.moveAllowed(Figure.fieldLength * 4 + 4, Figure.fieldLength * 3 + 4, new int[Figure.fieldLength * Figure.fieldLength]));
-    }
-
-    @Test
-    void whiteFarmerInvalidDestinationDownVar2() // Bauer (w) steht in der Mitte vom Feld und geht 1 nach unten
-    {
-        Figure f = new FigureFarmer();
-        assertFalse(f.moveAllowed(Figure.fieldLength * 4 + 4, Figure.fieldLength * 5 + 4, new int[Figure.fieldLength * Figure.fieldLength]));
-    }
-
     // weißer Turm
     @Test
     void whiteRookValidMoveUp()