diff --git a/bin/TennisGame.class b/bin/TennisGame.class
index 2da4e7a..7245097 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..43217c9 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..bb112d9 100644
--- a/src/TennisGame.java
+++ b/src/TennisGame.java
@@ -83,9 +83,9 @@ public String getScore() {
 			if (player1Points >= 4 && player1Points - player2Points == 1)
 				return "player1 has advantage";
 			
-			if (player2Points > 4 && player2Points - player1Points == 1)
+			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..11cc36b 100644
--- a/tests/TennisGameTest.java
+++ b/tests/TennisGameTest.java
@@ -51,6 +51,7 @@ public void testTennisGame_EahcPlayerWin4Points_Score_Deuce() throws TennisGameE
 		assertEquals("Tie score incorrect", "deuce", score);		
 	}
 	
+		
 	@Test (expected = TennisGameException.class)
 	public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() throws TennisGameException {
 		//Arrange
@@ -63,5 +64,139 @@ public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() thr
 		//Act
 		// This statement should cause an exception
 		game.player1Scored();			
-	}		
+	}	
+	
+	@Test  //1-0
+	public void testTennisGame_Score1_0() throws TennisGameException {
+		//Arrange
+		TennisGame game = new TennisGame();
+		
+		game.player1Scored();
+		
+		//Act
+		String score = game.getScore() ;
+		// Assert
+		assertEquals("Tie score incorrect", "15 - love", score);		
+	}
+	
+	@Test  //2-0
+	public void testTennisGame_Score2_0() throws TennisGameException {
+		//Arrange
+		TennisGame game = new TennisGame();
+		
+		game.player1Scored();
+		game.player1Scored();
+		
+		//Act
+		String score = game.getScore() ;
+		// Assert
+		assertEquals("Tie score incorrect", "30 - love", score);		
+	}
+	
+	@Test  //0-3
+	public void testTennisGame_Score0_3() throws TennisGameException {
+		//Arrange
+		TennisGame game = new TennisGame();
+		
+		game.player2Scored();
+		game.player2Scored();
+		game.player2Scored();
+		
+		//Act
+		String score = game.getScore() ;
+		// Assert
+		assertEquals("Tie score incorrect", "love - 40", score);		
+	}
+	
+	@Test  //2-2
+	public void testTennisGame_Score2_2() throws TennisGameException {
+		//Arrange
+		TennisGame game = new TennisGame();
+		
+		game.player1Scored();
+		game.player1Scored();
+		game.player2Scored();
+		game.player2Scored();
+		
+		//Act
+		String score = game.getScore() ;
+		// Assert
+		assertEquals("Tie score incorrect", "30 - 30", score);		
+	}
+	
+	@Test //4-2
+	public void testTennisGame_Score4_2() throws TennisGameException {
+		//Arrange
+		TennisGame game = new TennisGame();
+		
+		game.player2Scored();
+		game.player2Scored();
+		game.player1Scored();
+		game.player1Scored();
+		game.player1Scored();
+		game.player1Scored();
+		
+		//Act
+		String score = game.getScore() ;
+		// Assert
+		assertEquals("Tie score incorrect", "player1 wins", score);		
+	}
+	
+	
+	@Test 
+	public void testTennisGame_Score0_4() throws TennisGameException {
+		//Arrange
+		TennisGame game = new TennisGame();
+		
+		game.player2Scored();
+		game.player2Scored();
+		game.player2Scored();
+		game.player2Scored();
+		
+		//Act
+		String score = game.getScore() ;
+		// Assert
+		assertEquals("Tie score incorrect", "player2 wins", score);		
+	}
+	
+
+	@Test //3-4
+	public void testTennisGame_Score3_4() throws TennisGameException {
+		//Arrange
+		TennisGame game = new TennisGame();
+		
+		game.player1Scored();
+		game.player1Scored();
+		game.player1Scored();
+		game.player2Scored();
+		game.player2Scored();
+		game.player2Scored();
+		game.player2Scored();
+		
+		//Act
+		String score = game.getScore() ;
+		// Assert
+		assertEquals("Tie score incorrect", "player2 has advantage", score);		
+	}
+	
+	@Test //5-4
+	public void testTennisGame_Score5_4() throws TennisGameException {
+		//Arrange
+		TennisGame game = new TennisGame();
+		
+		game.player1Scored();
+		game.player1Scored();
+		game.player1Scored();
+		game.player2Scored();
+		game.player2Scored();
+		game.player2Scored();
+		game.player1Scored();
+		game.player2Scored();
+		game.player1Scored();
+		
+		//Act
+		String score = game.getScore() ;
+		// Assert
+		assertEquals("Tie score incorrect", "player1 has advantage", score);		
+	}
 }