@@ -97,7 +97,7 @@ def profile(oci_credential, oci_compartment_id, test_env, cursor):
 
 ############################################### NEGATIVE FEEDBACK TESTS
 def test_4001(profile, cursor):
-    """Valid input: Test with valid prompt_spec, sql_id, response, and feedback_content."""
+    """Add negative feedback using SHOWSQL prompt_spec, response, and feedback_content."""
     prompt = PROMPT
     action = Action.SHOWSQL
     response = (
@@ -124,7 +124,7 @@ def test_4001(profile, cursor):
     assert response in show_prompt
 
 def test_4002(profile, cursor):
-    """Valid input: Test with valid prompt_spec, sql_id, response, and feedback_content."""
+    """Add negative feedback using RUNSQL prompt_spec, response, and feedback_content."""
     prompt = PROMPT
     action = Action.RUNSQL
     response = (
@@ -151,7 +151,7 @@ def test_4002(profile, cursor):
     assert response in show_prompt
 
 def test_4003(profile, cursor):
-    """Valid input: Test with valid prompt_spec, sql_id, response, and feedback_content."""
+    """Add negative feedback using EXPLAINSQL prompt_spec, response, and feedback_content."""
     prompt = PROMPT
     action = Action.EXPLAINSQL
     response = (
@@ -178,7 +178,7 @@ def test_4003(profile, cursor):
     assert response in show_prompt
 
 def test_4004(profile, cursor):
-    """Valid input: Test with valid sql_id, response, and feedback_content."""
+    """Add negative feedback using SHOWSQL sql_id, response, and feedback_content."""
     sql_id = SHOWSQL_SQL_ID
     response = (
         "SELECT p4.name, g4.total_points FROM people p4 JOIN gymnast g4 "
@@ -203,7 +203,7 @@ def test_4004(profile, cursor):
     assert response in show_prompt
 
 def test_4005(profile, cursor):
-    """Valid input: Test with valid sql_id, response, and feedback_content."""
+    """Add negative feedback using RUNSQL sql_id, response, and feedback_content."""
     sql_id = RUNSQL_SQL_ID
     response = (
         "SELECT p4.name, g4.total_points FROM people p4 JOIN gymnast g4 "
@@ -228,7 +228,7 @@ def test_4005(profile, cursor):
     assert response in show_prompt
 
 def test_4006(profile, cursor):
-    """Valid input: Test with valid sql_id, response, and feedback_content."""
+    """Add negative feedback using EXPLAINSQL sql_id, response, and feedback_content."""
     sql_id = EXPLAINSQL_SQL_ID
     response = (
         "SELECT p4.name, g4.total_points FROM people p4 JOIN gymnast g4 "
@@ -253,7 +253,7 @@ def test_4006(profile, cursor):
     assert response in show_prompt
 
 def test_4007(profile, cursor):
-    """Conflicting input: Test with both prompt_spec and sql_id for negative feedback."""
+    """Attempt negative feedback with both prompt_spec and sql_id."""
     prompt = PROMPT
     action = Action.SHOWSQL
     sql_id = SHOWSQL_SQL_ID
@@ -281,7 +281,7 @@ def test_4007(profile, cursor):
     logger.error("%s", str(exc_info.value).splitlines()[0])
 
 def test_4008(profile, cursor):
-    """Missing required parameters: Test with missing response (for negative feedback)."""
+    """Attempt negative feedback without a response."""
     prompt = PROMPT
     action = Action.SHOWSQL
     sql_id = SHOWSQL_SQL_ID
@@ -301,7 +301,7 @@ def test_4008(profile, cursor):
     logger.error("%s", str(exc_info.value).splitlines()[0])
 
 def test_4009(profile, cursor):
-    """Missing required parameters: Test with missing feedback_content (for negative feedback)."""
+    """Add negative feedback with sql_id and response but without feedback_content."""
     prompt = PROMPT
     action = Action.SHOWSQL
     sql_id = SHOWSQL_SQL_ID
@@ -325,7 +325,7 @@ def test_4009(profile, cursor):
     assert response in show_prompt
 
 def test_4010(profile, cursor):
-    """Empty input: Test with empty strings or None values for prompt_spec."""
+    """Add negative feedback with prompt_spec=None and a valid sql_id."""
     sql_id = SHOWSQL_SQL_ID
     response = (
         "SELECT p6.name, g6.total_points FROM people p6 JOIN gymnast g6 "
@@ -351,7 +351,7 @@ def test_4010(profile, cursor):
     assert response in show_prompt
 
 def test_4011(profile, cursor):
-    """Empty input: Test with empty strings or None values for sql_id."""
+    """Add negative feedback with sql_id=None and a valid prompt_spec."""
     prompt = PROMPT
     action = Action.SHOWSQL
     response = (
@@ -379,7 +379,7 @@ def test_4011(profile, cursor):
     assert response in show_prompt
 
 def test_4012(profile, cursor):
-    """Empty input: Test with empty strings or None values for response."""
+    """Attempt negative feedback with response=None."""
     prompt = PROMPT
     action = Action.SHOWSQL
     sql_id = SHOWSQL_SQL_ID
@@ -400,7 +400,7 @@ def test_4012(profile, cursor):
     logger.error("%s", str(exc_info.value).splitlines()[0])
 
 def test_4013(profile, cursor):
-    """Empty input: Test with empty strings or None values for feedback_content."""
+    """Add negative feedback with feedback_content=None using sql_id."""
     prompt = PROMPT
     action = Action.SHOWSQL
     sql_id = SHOWSQL_SQL_ID
@@ -426,7 +426,7 @@ def test_4013(profile, cursor):
 
 
 def test_4014(profile, cursor):
-    """Valid input: Test negative feedback with non-existent prompt."""
+    """Add negative feedback for a non-existent SHOWSQL prompt."""
     prompt = "Adding negative feedback with non existent prompt"
     action = Action.SHOWSQL
     response = (
@@ -454,7 +454,7 @@ def test_4014(profile, cursor):
 
 ############################################################## POSITIVE FEEDBACK TESTS
 def test_4015(profile, cursor):
-    """Valid input: Test with valid prompt_spec and sql_id."""
+    """Add positive feedback using SHOWSQL prompt_spec only."""
     prompt = PROMPT
     action = Action.SHOWSQL
     logger.info(
@@ -471,7 +471,7 @@ def test_4015(profile, cursor):
     assert "user_prompt" in show_prompt
 
 def test_4016(profile, cursor):
-    """Valid input: Test with valid prompt_spec and sql_id for RUNSQL action."""
+    """Add positive feedback using RUNSQL prompt_spec only."""
     prompt = PROMPT
     action = Action.RUNSQL
     logger.info(
@@ -488,7 +488,7 @@ def test_4016(profile, cursor):
     assert "user_prompt" in show_prompt
 
 def test_4017(profile, cursor):
-    """Valid input: Test with valid prompt_spec and sql_id for EXPLAINSQL action."""
+    """Add positive feedback using EXPLAINSQL prompt_spec only."""
     prompt = PROMPT
     action = Action.EXPLAINSQL
     logger.info(
@@ -505,7 +505,7 @@ def test_4017(profile, cursor):
     assert "user_prompt" in show_prompt
 
 def test_4018(profile, cursor):
-    """Conflicting input: Test with both prompt_spec and sql_id for positive feedback."""
+    """Attempt positive feedback with both prompt_spec and sql_id."""
     prompt = PROMPT
     action = Action.SHOWSQL
     sql_id = SHOWSQL_SQL_ID
@@ -524,7 +524,7 @@ def test_4018(profile, cursor):
     logger.error("%s", str(exc_info.value).splitlines()[0])
 
 def test_4019(profile, cursor):
-    """Valid input: Test with valid sql_id for positive feedback."""
+    """Add positive feedback using SHOWSQL sql_id only."""
     sql_id = SHOWSQL_SQL_ID
     logger.info("Adding positive feedback without prompt_spec using sql_id=%s", sql_id)
     profile.add_positive_feedback(sql_id=sql_id)
@@ -537,7 +537,7 @@ def test_4019(profile, cursor):
 
 
 def test_4020(profile, cursor):
-    """Valid input: Test with valid sql_id for positive feedback."""
+    """Add positive feedback using RUNSQL sql_id only."""
     sql_id = RUNSQL_SQL_ID
     logger.info("Adding positive feedback without prompt_spec using sql_id=%s", sql_id)
     profile.add_positive_feedback(sql_id=sql_id)
@@ -549,7 +549,7 @@ def test_4020(profile, cursor):
     assert "user_prompt" in show_prompt
 
 def test_4021(profile, cursor):
-    """Valid input: Test with valid sql_id for positive feedback."""
+    """Add positive feedback using EXPLAINSQL sql_id only."""
     sql_id = EXPLAINSQL_SQL_ID
     logger.info("Adding positive feedback without prompt_spec using sql_id=%s", sql_id)
     profile.add_positive_feedback(sql_id=sql_id)
@@ -561,7 +561,7 @@ def test_4021(profile, cursor):
     assert "user_prompt" in show_prompt
 
 def test_4022(profile, cursor):
-    """Empty input: Test with empty strings or None values for prompt_spec."""
+    """Add positive feedback with prompt_spec=None and a valid sql_id."""
     sql_id = SHOWSQL_SQL_ID
     logger.info("Adding positive feedback with prompt_spec=None sql_id=%s", sql_id)
     profile.add_positive_feedback(
@@ -576,7 +576,7 @@ def test_4022(profile, cursor):
     assert "user_prompt" in show_prompt
 
 def test_4023(profile, cursor):
-    """Empty input: Test with empty strings or None values for sql_id."""
+    """Add positive feedback with sql_id=None and a valid prompt_spec."""
     prompt = PROMPT
     action = Action.SHOWSQL
     logger.info(
@@ -597,7 +597,7 @@ def test_4023(profile, cursor):
 
 
 def test_4024(profile, cursor):
-    """Valid input: Test positive feedback with non-existent prompt."""
+    """Attempt positive feedback for a non-existent SHOWSQL prompt."""
     prompt = "Adding positive feedback with non existent prompt"
     action = Action.SHOWSQL
     logger.info(
@@ -612,7 +612,7 @@ def test_4024(profile, cursor):
 
 ############################################################## DELETE FEEDBACK TESTS
 def test_4025(profile, cursor):
-    """Valid input: Test with valid prompt_spec."""
+    """Delete feedback by prompt_spec after adding positive SHOWSQL feedback."""
     prompt = PROMPT
     action = Action.SHOWSQL
     logger.info(
@@ -636,7 +636,7 @@ def test_4025(profile, cursor):
     assert show_prompt.count(PROMPT) == 1
 
 def test_4026(profile, cursor):
-    """Valid input: Test delete feedback using sql_id."""
+    """Delete feedback by RUNSQL sql_id after adding negative feedback with sql_id."""
     sql_id = RUNSQL_SQL_ID
     response = (
         "SELECT p.name, g.total_points FROM people p JOIN gymnast g "
@@ -663,7 +663,7 @@ def test_4026(profile, cursor):
     assert show_prompt.count(PROMPT) == 1
 
 def test_4027(profile, cursor):
-    """Valid input: Test delete feedback with valid prompt_spec."""
+    """Delete feedback by prompt_spec after adding positive EXPLAINSQL feedback."""
     prompt = PROMPT
     action = Action.EXPLAINSQL
     logger.info(
@@ -686,7 +686,7 @@ def test_4027(profile, cursor):
     assert show_prompt.count(PROMPT) == 1
 
 def test_4028(profile, cursor):
-    """Valid input: Test delete feedback by sql_id after negative feedback."""
+    """Delete SHOWSQL feedback by sql_id after adding negative prompt-based feedback."""
     prompt = PROMPT
     action = Action.SHOWSQL
     sql_id = SHOWSQL_SQL_ID
@@ -717,10 +717,10 @@ def test_4028(profile, cursor):
 
 
 def test_4029(profile, cursor):
-    """Valid input: Test delete feedback by sql_id after negative feedback."""
+    """Delete RUNSQL feedback by sql_id after adding negative prompt-based feedback."""
     prompt = PROMPT
-    action = Action.SHOWSQL
-    sql_id = SHOWSQL_SQL_ID
+    action = Action.RUNSQL
+    sql_id = RUNSQL_SQL_ID
     response = (
         "SELECT p.name, g.total_points FROM people p JOIN gymnast g "
         "ON p.id = g.id ORDER BY g.total_points DESC"
@@ -747,10 +747,10 @@ def test_4029(profile, cursor):
     assert show_prompt.count(PROMPT) == 1
 
 def test_4030(profile, cursor):
-    """Valid input: Test delete feedback by sql_id after negative feedback."""
+    """Delete EXPLAINSQL feedback by sql_id after adding negative prompt-based feedback."""
     prompt = PROMPT
-    action = Action.SHOWSQL
-    sql_id = SHOWSQL_SQL_ID
+    action = Action.EXPLAINSQL
+    sql_id = EXPLAINSQL_SQL_ID
     response = (
         "SELECT p.name, g.total_points FROM people p JOIN gymnast g "
         "ON p.id = g.id ORDER BY g.total_points DESC"
@@ -778,7 +778,7 @@ def test_4030(profile, cursor):
 
 
 def test_4031(profile, cursor):
-    """Valid input: Test delete feedback with sql_id=None."""
+    """Delete feedback with sql_id=None and a valid prompt_spec."""
     prompt = PROMPT
     action = Action.SHOWSQL
     sql_id = SHOWSQL_SQL_ID
@@ -808,7 +808,7 @@ def test_4031(profile, cursor):
 
 
 def test_4032(profile, cursor):
-    """Valid input: Test delete feedback with prompt_spec=None."""
+    """Delete feedback with prompt_spec=None and a valid sql_id."""
     prompt = PROMPT
     action = Action.SHOWSQL
     sql_id = SHOWSQL_SQL_ID
@@ -832,7 +832,7 @@ def test_4032(profile, cursor):
     assert show_prompt.count(PROMPT) == 1
 
 def test_4033(profile, cursor):
-    """Conflicting input: Test delete feedback with both prompt_spec and sql_id."""
+    """Attempt delete_feedback with both prompt_spec and sql_id."""
     prompt = PROMPT
     action = Action.SHOWSQL
     sql_id = SHOWSQL_SQL_ID