diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef0d11b..1a63228 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,7 +46,7 @@ add_test(test_thperrier_game_is_lightbulb ./game_test_thperrier game_is_lightbul
 add_test(test_thperrier_game_is_black ./game_test_thperrier game_is_black)
 add_test(test_thperrier_game_get_black_number ./game_test_thperrier game_get_black_number)
 
-add_test(test_nnunes_dummy ./game_test_thperrier dummy)
+add_test(test_nnunes_dummy ./game_test_nnunes dummy)
 add_test(test_nnunes_game_get_square ./game_test_nnunes game_get_square)
 add_test(test_nnunes_game_get_state ./game_test_nnunes game_get_state)
 add_test(test_nnunes_game_get_flags ./game_test_nnunes game_get_flags)
diff --git a/game_test_nnunes.c b/game_test_nnunes.c
index af9cfe2..fc44991 100644
--- a/game_test_nnunes.c
+++ b/game_test_nnunes.c
@@ -134,11 +134,6 @@ bool test_game_get_square(void){
     game_delete(g);
     return false;
   } 
-  game_set_square(g, 0, 0, (S_BLACKU|F_LIGHTED));
-  if (game_get_square(g, 0, 0) != (S_BLACKU|F_LIGHTED)){
-    game_delete(g);
-    return false;
-  }
   game_set_square(g, 0, 0, (S_LIGHTBULB|F_LIGHTED|F_ERROR));
   if (game_get_square(g, 0, 0) != (S_LIGHTBULB|F_LIGHTED|F_ERROR)){
     game_delete(g);
@@ -153,12 +148,7 @@ bool test_game_get_square(void){
   if (game_get_square(g, 0, 0) != (S_MARK|F_LIGHTED|F_ERROR)){
     game_delete(g);
     return false;
-  }  
-  game_set_square(g, 0, 0, (S_BLACKU|F_LIGHTED|F_ERROR));
-  if (game_get_square(g, 0, 0) != (S_BLACKU|F_LIGHTED|F_ERROR)){
-    game_delete(g);
-    return false;
-  }  
+  }   
   game_delete(g);
   return true;                           
 }
@@ -262,6 +252,11 @@ bool test_game_is_lighted(void){
     game_delete(g);
     return true;
   }
+  game_set_square(g, 0, 0, S_BLANK|F_LIGHTED|F_ERROR);
+  if((game_get_flags(g, 0, 0) == (F_LIGHTED|F_ERROR)) && game_is_lighted(g, 0, 0)){
+    game_delete(g);
+    return true;
+  }     
   game_delete(g);
   return false;
 }
@@ -269,16 +264,18 @@ bool test_game_is_lighted(void){
 /* ************** game_has_error ************** */
 bool test_game_has_error(void){
   game g = game_new_empty();
-  for(int i=0; i < DEFAULT_SIZE; i++){
-    for(int j=0; j < DEFAULT_SIZE; j++){
-      if(((game_get_flags(g, i, j) == F_ERROR)||(game_get_flags(g, i, j) == (F_ERROR|F_LIGHTED))) && (game_has_error(g, i, j) == false)){
-        game_delete(g);
-        return false;
-      }
+  game_set_square(g, 0, 0, S_BLANK|F_ERROR);
+    if((game_get_flags(g, 0, 0) == F_ERROR) && game_has_error(g, 0, 0)){
+      game_delete(g);
+      return true;
     }
-  }
+  game_set_square(g, 0, 0, S_BLANK|F_LIGHTED|F_ERROR);
+  if((game_get_flags(g, 0, 0) == (F_LIGHTED|F_ERROR)) && game_has_error(g, 0, 0)){
+    game_delete(g);
+    return true;
+  }   
   game_delete(g);
-  return true;
+  return false;
 }
 
 int main(int argc, char * argv[]){