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..b7ec745 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..4249653 100644
--- a/tests/TennisGameTest.java
+++ b/tests/TennisGameTest.java
@@ -64,4 +64,106 @@ public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() thr
 		// This statement should cause an exception
 		game.player1Scored();			
 	}		
+	@Test
+	public void testTennisGame_Player1advantage() throws TennisGameException {
+		TennisGame game = new TennisGame();
+		
+		game.player1Scored();
+		game.player2Scored();
+		game.player1Scored();
+		game.player2Scored();
+		game.player1Scored();
+		game.player2Scored();
+		game.player1Scored();
+		
+		String score = game.getScore();
+		assertEquals("Advantage for player 1", "player1 has advantage", score);
+		
+	}
+	
+	@Test
+	public void testTennisGame_Player2wins() throws TennisGameException {
+		TennisGame game = new TennisGame();
+		game.player1Scored();
+		game.player2Scored();
+		game.player1Scored();
+		game.player2Scored();
+		game.player1Scored();
+		game.player2Scored();
+		game.player2Scored();
+		game.player2Scored();
+		
+		String score = game.getScore();
+		assertEquals("Player 2 wins", "player2 wins", score);
+	}
+	
+	@Test
+	public void testTennisGame_Player2advantage() throws TennisGameException {
+		TennisGame game = new TennisGame();
+		
+		game.player1Scored();
+		game.player2Scored();
+		game.player1Scored();
+		game.player2Scored();
+		game.player1Scored();
+		game.player2Scored();
+		game.player2Scored();
+		
+		String score = game.getScore();
+		assertEquals("Advantage for player 2", "player2 has advantage", score);
+	}
+	
+	@Test
+	public void testTennisGame_Player1wins() throws TennisGameException {
+		TennisGame game = new TennisGame();
+		game.player1Scored();
+		game.player2Scored();
+		game.player1Scored();
+		game.player2Scored();
+		game.player1Scored();
+		game.player2Scored();
+		game.player1Scored();
+		game.player1Scored();
+		
+		String score = game.getScore();
+		assertEquals("Player 1 wins", "player1 wins", score);
+	}
+	
+	@Test
+	public void testTennisGame_40_love() throws TennisGameException {
+		TennisGame game = new TennisGame();
+		
+		game.player1Scored();
+		game.player1Scored();
+		game.player1Scored();
+		
+		String score = game.getScore();
+		assertEquals("40 - love", "40 - love", score);
+	
+	}
+	
+	public void testTennisGame_30_15() throws TennisGameException {
+		TennisGame game = new TennisGame();
+		
+		game.player1Scored();
+		game.player1Scored();
+		game.player2Scored();
+		
+		String score = game.getScore();
+		assertEquals("30 - 15", "30 - 15", score);
+	
+	}
+	
+	public void testTennisGame_15_40() throws TennisGameException {
+		TennisGame game = new TennisGame();
+		
+		game.player1Scored();
+		game.player2Scored();
+		game.player2Scored();
+		game.player2Scored();
+		
+		String score = game.getScore();
+		assertEquals("15 - 40", "15 - 40", score);
+	
+	}
 }