diff --git a/bin/TennisGame.class b/bin/TennisGame.class
index 2da4e7a..fe829ab 100644
Binary files a/bin/TennisGame.class and b/bin/TennisGame.class differ
diff --git a/bin/TennisGameTest.class b/bin/TennisGameTest.class
index b202db2..3659747 100644
Binary files a/bin/TennisGameTest.class and b/bin/TennisGameTest.class differ
diff --git a/src/TennisGame.java b/src/TennisGame.java
index 327f284..a959531 100644
--- a/src/TennisGame.java
+++ b/src/TennisGame.java
@@ -77,7 +77,7 @@ public String getScore() {
 					return "player2 wins";
 			}
 			
-			if (player1Points >= 4 && player1Points == player2Points)
+			if (player1Points >= 3 && player1Points == player2Points)
 				return "deuce";
 			
 			if (player1Points >= 4 && player1Points - player2Points == 1)
@@ -86,6 +86,6 @@ public String getScore() {
 			if (player2Points > 4 && player2Points - player1Points == 1)
 				return "player2 has advantage";							
 			
-			return  player2Score + " - " + player1Score ;
+			return  player1Score + " - " + player2Score ;
 	}
 }
\ No newline at end of file
diff --git a/tests/TennisGameTest.java b/tests/TennisGameTest.java
index 8674eba..c195272 100644
--- a/tests/TennisGameTest.java
+++ b/tests/TennisGameTest.java
@@ -20,6 +20,61 @@ public class TennisGameTest {
 // "player2 has advantage"
 // "player1 wins"
 // "player2 wins"
+	
+	@Test
+	public void testScore() throws TennisGameException {
+		
+		
+		TennisGame game = new TennisGame() ;
+		game.player1Scored();
+		
+		assertEquals("15 - love" ,game.getScore());
+	}
+	
+	@Test
+	public void testPlayer1Advantage() throws TennisGameException {
+		
+		
+		TennisGame game = new TennisGame() ;
+		game.player1Scored();
+		game.player1Scored();
+		game.player1Scored();
+		game.player2Scored();
+		game.player2Scored();
+		game.player2Scored();
+		game.player1Scored();
+		assertEquals("player1 has advantage" ,game.getScore());
+	}
+	
+	@Test
+	public void testPlayer2Wins() throws TennisGameException {
+		
+		
+		TennisGame game = new TennisGame() ;
+		game.player2Scored();
+		game.player2Scored();
+		game.player2Scored();
+		game.player2Scored();
+
+		assertEquals("player2 wins" ,game.getScore());
+	}
+	
+
+	@Test
+	public void testDeuce() throws TennisGameException {
+		
+		
+		TennisGame game = new TennisGame() ;
+		game.player2Scored();
+		game.player2Scored();
+		game.player2Scored();
+		game.player1Scored();
+		game.player1Scored();
+		game.player1Scored();
+		
+		assertEquals("deuce" ,game.getScore());
+	}
+	
 	@Ignore
 	public void testTennisGame_Start() {
 		//Arrange