diff --git a/src/main/java/de/tims/viergewinnt/ai/Logic.java b/src/main/java/de/tims/viergewinnt/ai/Logic.java
index dc3a04e..33636f6 100644
--- a/src/main/java/de/tims/viergewinnt/ai/Logic.java
+++ b/src/main/java/de/tims/viergewinnt/ai/Logic.java
@@ -32,15 +32,15 @@ public class Logic {
 		return currentPlayer;
 	}
 	
-	public int playChip(int column, int player) {
+	public int playChip(int column) {
 		
 		//add board update
 		
 		updateGui();
-		if(testForWin(player)) {
+		if(testForWin()) {
 			calcScore();
 		}
-		currentPlayer = (player % 2) + 1;
+		setCurrentPlayer((getCurrentPlayer() % 2) + 1);
 		return 0;
 	}
 	
@@ -95,7 +95,7 @@ public class Logic {
 		public void actionPerformed(ActionEvent e) {
 			for(int i = 0; i < buttons.length; i++) {
 				if(e.getSource() == buttons[i]) {
-					playChip(i, currentPlayer);
+					playChip(i);
 					break;
 				}
 			}
@@ -103,7 +103,8 @@ public class Logic {
 		
 	}
 	
-	public boolean testForWin(int player) {
+	public boolean testForWin() {
+		int player = getCurrentPlayer();
 		int chain = 0;
 		for(int i = 0; i < board[0].length; i++) {
 			for(int j = 0; j < board.length; j++) {
diff --git a/src/test/java/de/tims/viergewinnt/ai/LogicTest.java b/src/test/java/de/tims/viergewinnt/ai/LogicTest.java
index bbb5fa9..9bd71da 100644
--- a/src/test/java/de/tims/viergewinnt/ai/LogicTest.java
+++ b/src/test/java/de/tims/viergewinnt/ai/LogicTest.java
@@ -27,8 +27,9 @@ class LogicTest {
 				testObj.setField(playfield[i][j], i, j);
 			}
 		}
+		testObj.setCurrentPlayer(player);
 		
-		boolean realResult = testObj.testForWin(player);
+		boolean realResult = testObj.testForWin();
 		
 		assertEquals(expectedResult, realResult);
 	}
@@ -39,7 +40,9 @@ class LogicTest {
 		int player = 1;
 		int expectedResult = 0;
 		testObj.create4gewinntGui();
-		int realResult = testObj.playChip(column, player);
+		testObj.setCurrentPlayer(player);
+		
+		int realResult = testObj.playChip(column);
 		
 		assertEquals(expectedResult, realResult);
 	}
@@ -49,9 +52,10 @@ class LogicTest {
 		int column = 0;
 		int player = 1;
 		int expectedResult = 2;
-		
 		testObj.create4gewinntGui();
-		testObj.playChip(column, player);
+		testObj.setCurrentPlayer(player);
+		testObj.playChip(column);
+		
 		int realResult = testObj.currentPlayer;
 		
 		assertEquals(expectedResult, realResult);
@@ -62,9 +66,10 @@ class LogicTest {
 		int column = 0;
 		int player = 2;
 		int expectedResult = 1;
-		
 		testObj.create4gewinntGui();
-		testObj.playChip(column, player);
+		testObj.setCurrentPlayer(player);
+		testObj.playChip(column);
+		
 		int realResult = testObj.currentPlayer;
 		
 		assertEquals(expectedResult, realResult);