diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b261db..9878364 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,8 +33,8 @@ add_test(test_thoguet_game_default_solution ./game_test_thoguet game_default_sol
 add_test(test_thoguet_game_restart ./game_test_thoguet game_restart)
 add_test(test_thoguet_game_is_over ./game_test_thoguet game_is_over)
 add_test(test_thoguet_game_update_flags ./game_test_thoguet game_update_flags)
-add_test(test_game_play_move ./game_test_thoguet game_play_move)
-add_test(test_game_check_move ./game_test_thoguet game_check_move)
+add_test(test_thoguet_game_play_move ./game_test_thoguet game_play_move)
+add_test(test_thoguet_game_check_move ./game_test_thoguet game_check_move)
 
 add_test(test_thperrier_dummy ./game_test_thperrier dummy)
 add_test(test_thperrier_game_copy ./game_test_thperrier game_copy)
diff --git a/game_test_thoguet.c b/game_test_thoguet.c
index 9a59484..47ee316 100644
--- a/game_test_thoguet.c
+++ b/game_test_thoguet.c
@@ -100,15 +100,21 @@ bool test_game_default(void){
 	game g = game_default();
 	//a verif aps sur
 	assert(g);
-	assert(game_get_square(g,0,2) == S_BLACK1);
-	assert(game_get_square(g,1,2) == S_BLACK2);
-	assert(game_get_square(g,2,5) == S_BLACKU);
-	assert(game_get_square(g,2,6) == S_BLACK2);
-	assert(game_get_square(g,4,0) == S_BLACK1);
-	assert(game_get_square(g,4,1) == S_BLACKU);
-	assert(game_get_square(g,5,4) == S_BLACK2);
-	assert(game_get_square(g,6,4) == S_BLACKU);
+	square tab[49] = 
+	{
+                /*X0       X1       X2       X3       X4        X5      X6*/
+        /*Y 0*/ S_BLANK, S_BLANK, S_BLACK1, S_BLANK, S_BLANK, S_BLANK, S_BLANK,
+        /*Y 1*/ S_BLANK, S_BLANK, S_BLACK2, S_BLANK, S_BLANK, S_BLANK, S_BLANK,
+        /*Y 2*/ S_BLANK, S_BLANK, S_BLANK, S_BLANK, S_BLANK, S_BLACKU, S_BLACK2,
+        /*Y 3*/ S_BLANK, S_BLANK, S_BLANK, S_BLANK, S_BLANK, S_BLANK, S_BLANK,
+        /*Y 4*/ S_BLACK1, S_BLACKU, S_BLANK, S_BLANK, S_BLANK, S_BLANK, S_BLANK,
+        /*Y 5*/ S_BLANK, S_BLANK, S_BLANK, S_BLANK, S_BLACK2, S_BLANK, S_BLANK,
+        /*Y 6*/ S_BLANK, S_BLANK, S_BLANK, S_BLANK, S_BLACKU, S_BLANK, S_BLANK
+	};
+	game g1 = game_new(tab);
+	assert(game_equal(g,g1));
 	game_delete(g);
+	game_delete(g1);
 	return EXIT_SUCCESS;
 }
 
@@ -116,27 +122,21 @@ bool test_game_default(void){
 
 bool test_game_default_solution(void){
 	game g = game_default_solution();
+	game g1 = game_default();
 	assert(g);
-	//default
-	assert(game_get_square(g,0,2) == S_BLACK1);
-	assert(game_get_square(g,1,2) == S_BLACK2);
-	assert(game_get_square(g,2,5) == S_BLACKU);
-	assert(game_get_square(g,2,6) == S_BLACK2);
-	assert(game_get_square(g,4,0) == S_BLACK1);
-	assert(game_get_square(g,4,1) == S_BLACKU);
-	assert(game_get_square(g,5,4) == S_BLACK2);
-	assert(game_get_square(g,6,4) == S_BLACKU);
 	//solution
-	assert(game_get_square(g,0,0) == (S_LIGHTBULB|F_LIGHTED));
-	assert(game_get_square(g,1,1) == (S_LIGHTBULB|F_LIGHTED));
-	assert(game_get_square(g,0,3) == (S_LIGHTBULB|F_LIGHTED));
-	assert(game_get_square(g,1,6) == (S_LIGHTBULB|F_LIGHTED));
-	assert(game_get_square(g,2,2) == (S_LIGHTBULB|F_LIGHTED));
-	assert(game_get_square(g,3,6) == (S_LIGHTBULB|F_LIGHTED));
-	assert(game_get_square(g,4,4) == (S_LIGHTBULB|F_LIGHTED));
-	assert(game_get_square(g,5,0) == (S_LIGHTBULB|F_LIGHTED));
-	assert(game_get_square(g,5,5) == (S_LIGHTBULB|F_LIGHTED));
-	assert(game_get_square(g,6,1) == (S_LIGHTBULB|F_LIGHTED));
+	game_set_square(g1,0,0,S_LIGHTBULB);
+	game_set_square(g1,1,1,S_LIGHTBULB);
+	game_set_square(g1,0,3,S_LIGHTBULB);
+	game_set_square(g1,1,6,S_LIGHTBULB);
+	game_set_square(g1,2,2,S_LIGHTBULB);
+	game_set_square(g1,3,6,S_LIGHTBULB);
+	game_set_square(g1,4,4,S_LIGHTBULB);
+	game_set_square(g1,5,0,S_LIGHTBULB);
+	game_set_square(g1,5,5,S_LIGHTBULB);
+	game_set_square(g1,6,1,S_LIGHTBULB);
+	game_update_flags(g1);
+	assert(game_equal(g,g1));
 	game_delete(g);
 	return EXIT_SUCCESS;
 }