diff --git a/test/tap/tests/reg_test_3427-stmt_first_comment1-t.cpp b/test/tap/tests/reg_test_3427-stmt_first_comment1-t.cpp
index 4b03f23fd..2e2e50537 100644
--- a/test/tap/tests/reg_test_3427-stmt_first_comment1-t.cpp
+++ b/test/tap/tests/reg_test_3427-stmt_first_comment1-t.cpp
@@ -123,6 +123,7 @@ int main(int argc, char** argv) {
 		};
 		std::string update_mysql_queries {};
 		string_format(t_update_mysql_servers, update_mysql_queries, WRITER_HOSTGROUP_ID);
+		diag("Line:%d , Running query: %s", __LINE__ , update_mysql_queries.c_str());
 		MYSQL_QUERY(proxysql_admin, update_mysql_queries.c_str());
 		MYSQL_QUERY(proxysql_admin, "LOAD MYSQL SERVERS TO RUNTIME");
 
@@ -133,10 +134,13 @@ int main(int argc, char** argv) {
 		std::string max_stmt_query {};
 		string_format(t_max_stmt_query, max_stmt_query, MAX_STMT_NUM_QUERIES);
 		MYSQL_QUERY(proxysql_admin, max_stmt_query.c_str());
+		diag("Line:%d , Running query: %s", __LINE__ , max_stmt_query.c_str());
 		MYSQL_QUERY(proxysql_admin, "LOAD MYSQL VARIABLES TO RUNTIME");
 
 		uint32_t query_id = 0;
 
+		int rc = 0;
+
 		for (uint32_t i = 0; i < RESET_CONNECTION_QUERIES; i++) {
 			if (i <= MAX_STMT_NUM_QUERIES) {
 				query_id = i;
@@ -159,20 +163,23 @@ int main(int argc, char** argv) {
 			string_format(query_t, query, query_id);
 
 			MYSQL_STMT* stmt = mysql_stmt_init(proxysql_mysql);
+			ok(stmt != NULL , "mysql_stmt_init() succeeded");
 			if (!stmt) {
 				diag("mysql_stmt_init(), out of memory");
 				res = EXIT_FAILURE;
 				goto exit;
 			}
-			ok(stmt != NULL , "mysql_stmt_init() succeeded");
 
-			if (mysql_stmt_prepare(stmt, query.c_str(), strlen(query.c_str()))) {
+			diag("Line:%d , Preparing query: %s", __LINE__ , query.c_str());
+			rc = mysql_stmt_prepare(stmt, query.c_str(), strlen(query.c_str()));
+			ok(rc == 0, "mysql_stmt_prepare() succeeded");
+			if (rc) {
 				diag("mysql_stmt_prepare at line %d failed: %s", __LINE__ , mysql_error(proxysql_mysql));
 				mysql_close(proxysql_mysql);
 				res = EXIT_FAILURE;
 				goto exit;
 			} else {
-				ok(1,"mysql_stmt_prepare() succeeded");
+				//
 			}
 
 			if (param) {
@@ -194,7 +201,9 @@ int main(int argc, char** argv) {
 				}
 			}
 
-			if (mysql_stmt_execute(stmt)) {
+			rc = mysql_stmt_execute(stmt);
+			ok(rc == 0, "mysql_stmt_execute() succeeded");
+			if (rc) {
 				diag(
 					"mysql_stmt_execute at line %d failed: %s", __LINE__ ,
 					mysql_stmt_error(stmt)
@@ -202,7 +211,7 @@ int main(int argc, char** argv) {
 				res = EXIT_FAILURE;
 				goto exit;
 			} else {
-				ok(1,"mysql_stmt_execute() succeeded");
+				//
 			}
 
 			MYSQL_BIND bind[3];
@@ -233,7 +242,9 @@ int main(int argc, char** argv) {
 			bind[2].length = &length[2];
 			bind[2].error = &error[2];
 
-			if (mysql_stmt_bind_result(stmt, bind)) {
+			rc = mysql_stmt_bind_result(stmt, bind);
+			ok(rc == 0, "mysql_stmt_bind_result() succeeded");
+			if (rc) {
 				diag(
 					"mysql_stmt_bind_result at line %d failed: %s", __LINE__,
 					mysql_stmt_error(stmt)
@@ -241,10 +252,12 @@ int main(int argc, char** argv) {
 				res = EXIT_FAILURE;
 				goto exit;
 			} else {
-				ok(1,"mysql_stmt_bind_result() succeeded");
+				//
 			}
 
-			if (mysql_stmt_fetch(stmt) == 1) {
+			rc = mysql_stmt_fetch(stmt);
+			ok(rc == 0,"mysql_stmt_fetch() succeeded");
+			if (rc == 1) {
 				diag(
 					"mysql_stmt_fetch at line %d failed: %s", __LINE__,
 					mysql_stmt_error(stmt)
@@ -252,7 +265,7 @@ int main(int argc, char** argv) {
 				res = EXIT_FAILURE;
 				goto exit;
 			} else {
-				ok(1,"mysql_stmt_fetch() succeeded");
+				//
 			}
 
 			bool data_match_expected =