diff --git a/internal/test_cases/multi_command_test_case.go b/internal/test_cases/multi_command_test_case.go
index d245dad..bf73b59 100644
--- a/internal/test_cases/multi_command_test_case.go
+++ b/internal/test_cases/multi_command_test_case.go
@@ -16,7 +16,7 @@ type MultiCommandTestCase struct {
 
 func (t *MultiCommandTestCase) RunAll(client *resp_client.RespConnection, logger *logger.Logger) error {
 	if len(t.Assertions) != len(t.Commands) {
-		return fmt.Errorf("Number of commands and assertions should be equal")
+		return fmt.Errorf("CodeCrafters internal error. Number of commands and assertions should be equal in MultiCommandTestCase")
 	}
 
 	for i, command := range t.Commands {
diff --git a/internal/test_cases/transaction_test_case.go b/internal/test_cases/transaction_test_case.go
index 7d08790..bec5f38 100644
--- a/internal/test_cases/transaction_test_case.go
+++ b/internal/test_cases/transaction_test_case.go
@@ -9,7 +9,7 @@ import (
 
 // TransactionTestCase is a test case where we initiate a transaction by sending "MULTI" command
 // Send a series of commands to the server expected back "QUEUED" for each command
-// Finally send "EXEC" command and expect the response to be the same as ResultArray
+// Finally send "EXEC" command and expect the response to be the same as ExpectedResponseArray
 //
 // RunAll will run all the steps in the Transaction execution. Alternatively, you
 // can run each step individually.
@@ -20,8 +20,8 @@ type TransactionTestCase struct {
 
 	// After queueing all the commands,
 	// if ShouldSkipExec is false, "EXEC" is sent
-	// And the response is compared with this ResultArray
-	ResultArray []resp_value.Value
+	// And the response is compared with this ExpectedResponseArray
+	ExpectedResponseArray []resp_value.Value
 }
 
 func (t TransactionTestCase) RunAll(client *resp_client.RespConnection, logger *logger.Logger) error {
@@ -64,7 +64,7 @@ func (t TransactionTestCase) RunMulti(client *resp_client.RespConnection, logger
 
 func (t TransactionTestCase) RunQueueAll(client *resp_client.RespConnection, logger *logger.Logger) error {
 	for i, v := range t.CommandQueue {
-		logger.Debugf("Sent #%d command", i)
+		logger.Debugf("Sending command: #%d/#%d", i, len(t.CommandQueue))
 		commandTest := SendCommandTestCase{
 			Command:   v[0],
 			Args:      v[1:],
@@ -82,7 +82,7 @@ func (t TransactionTestCase) RunExec(client *resp_client.RespConnection, logger
 	setCommandTestCase := SendCommandTestCase{
 		Command:   "EXEC",
 		Args:      []string{},
-		Assertion: resp_assertions.NewOrderedArrayAssertion(t.ResultArray),
+		Assertion: resp_assertions.NewOrderedArrayAssertion(t.ExpectedResponseArray),
 	}
 
 	return setCommandTestCase.Run(client, logger)
diff --git a/internal/test_txn_discard.go b/internal/test_txn_discard.go
index 24b09ce..fa6aec5 100644
--- a/internal/test_txn_discard.go
+++ b/internal/test_txn_discard.go
@@ -47,7 +47,7 @@ func testTxDiscard(stageHarness *test_case_harness.TestCaseHarness) error {
 			{"SET", key1, fmt.Sprint(randomInt1)},
 			{"INCR", key1},
 		},
-		ResultArray: []resp_value.Value{},
+		ExpectedResponseArray: []resp_value.Value{},
 	}
 
 	if err := transactionTestCase.RunWithoutExec(client, logger); err != nil {
diff --git a/internal/test_txn_empty.go b/internal/test_txn_empty.go
index 38f1ab0..2e1fe34 100644
--- a/internal/test_txn_empty.go
+++ b/internal/test_txn_empty.go
@@ -26,8 +26,8 @@ func testTxEmpty(stageHarness *test_case_harness.TestCaseHarness) error {
 	defer client.Close()
 
 	emptyTransactionTestCase := test_cases.TransactionTestCase{
-		CommandQueue: [][]string{},
-		ResultArray:  []resp_value.Value{},
+		CommandQueue:          [][]string{},
+		ExpectedResponseArray: []resp_value.Value{},
 	}
 
 	if err := emptyTransactionTestCase.RunAll(client, logger); err != nil {
diff --git a/internal/test_txn_multi.go b/internal/test_txn_multi.go
index e4e35c8..6a0d2e5 100644
--- a/internal/test_txn_multi.go
+++ b/internal/test_txn_multi.go
@@ -25,8 +25,8 @@ func testTxMulti(stageHarness *test_case_harness.TestCaseHarness) error {
 	defer client.Close()
 
 	transactionTestCase := test_cases.TransactionTestCase{
-		CommandQueue: [][]string{},
-		ResultArray:  []resp_value.Value{},
+		CommandQueue:          [][]string{},
+		ExpectedResponseArray: []resp_value.Value{},
 	}
 
 	return transactionTestCase.RunMulti(client, logger)
diff --git a/internal/test_txn_multi_tx.go b/internal/test_txn_multi_tx.go
index f0b0d46..321e5c2 100644
--- a/internal/test_txn_multi_tx.go
+++ b/internal/test_txn_multi_tx.go
@@ -68,7 +68,7 @@ func testTxMultiTx(stageHarness *test_case_harness.TestCaseHarness) error {
 			// Inside each transaction, we run 1x INCR key1, key2
 			// So it increases by 1 for each transaction
 			// `i` here is 0-indexed, so we add 1 to the expected value
-			ResultArray: []resp_value.Value{resp_value.NewIntegerValue(3 + (1 + i)), resp_value.NewIntegerValue(randomIntegerValue + (1 + i))},
+			ExpectedResponseArray: []resp_value.Value{resp_value.NewIntegerValue(3 + (1 + i)), resp_value.NewIntegerValue(randomIntegerValue + (1 + i))},
 		}
 		if err := transactionTestCase.RunExec(client, logger); err != nil {
 			return err
diff --git a/internal/test_txn_queue.go b/internal/test_txn_queue.go
index 8bea8bd..e07f7b9 100644
--- a/internal/test_txn_queue.go
+++ b/internal/test_txn_queue.go
@@ -36,7 +36,7 @@ func testTxQueue(stageHarness *test_case_harness.TestCaseHarness) error {
 			{"SET", key, fmt.Sprint(randomIntegerValue)},
 			{"INCR", key},
 		},
-		ResultArray: []resp_value.Value{},
+		ExpectedResponseArray: []resp_value.Value{},
 	}
 
 	if err := transactionTestCase.RunWithoutExec(clients[0], logger); err != nil {
diff --git a/internal/test_txn_tx.go b/internal/test_txn_tx.go
index e83a5b5..cbe5d88 100644
--- a/internal/test_txn_tx.go
+++ b/internal/test_txn_tx.go
@@ -39,7 +39,7 @@ func testTxSuccess(stageHarness *test_case_harness.TestCaseHarness) error {
 			{"INCR", key2},
 			{"GET", key2},
 		},
-		ResultArray: []resp_value.Value{resp_value.NewSimpleStringValue("OK"), resp_value.NewIntegerValue(randomIntegerValue + 1), resp_value.NewIntegerValue(1), resp_value.NewBulkStringValue("1")},
+		ExpectedResponseArray: []resp_value.Value{resp_value.NewSimpleStringValue("OK"), resp_value.NewIntegerValue(randomIntegerValue + 1), resp_value.NewIntegerValue(1), resp_value.NewBulkStringValue("1")},
 	}
 
 	if err := transactionTestCase.RunAll(clients[0], logger); err != nil {
diff --git a/internal/test_txn_tx_failure.go b/internal/test_txn_tx_failure.go
index 6d2767b..7954649 100644
--- a/internal/test_txn_tx_failure.go
+++ b/internal/test_txn_tx_failure.go
@@ -53,7 +53,7 @@ func testTxErr(stageHarness *test_case_harness.TestCaseHarness) error {
 			{"INCR", key1},
 			{"INCR", key2},
 		},
-		ResultArray: []resp_value.Value{
+		ExpectedResponseArray: []resp_value.Value{
 			resp_value.NewErrorValue("ERR value is not an integer or out of range"), resp_value.NewIntegerValue(randomIntegerValue + 1)},
 	}