ssvlabs · GalRogozinski · Jul 30, 2025 · Jun 28, 2025 · Jul 1, 2025 · Jul 8, 2025
diff --git a/qbft/spectest/generate/main.go b/qbft/spectest/generate/main.go
@@ -69,6 +69,7 @@ func main() {
 		if err != nil {
 			panic(errors.Wrapf(err, "failed to get post state for test: %s", test.TestName()).Error())
 		}
+
 		writeJsonStateComparison(test.TestName(), reflect.TypeOf(test).String(), post)
 	}
 }

diff --git a/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_broadcast_decided.json b/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_broadcast_decided.json
diff --git a/...test/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_current_instance.json b/...test/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_current_instance.json
diff --git a/.../tests/tests.ControllerSpecTest_qbft_controller_decide_current_instance_future_round.json b/.../tests/tests.ControllerSpecTest_qbft_controller_decide_current_instance_future_round.json
diff --git a/...te/tests/tests.ControllerSpecTest_qbft_controller_decide_current_instance_past_round.json b/...te/tests/tests.ControllerSpecTest_qbft_controller_decide_current_instance_past_round.json
diff --git a/...pectest/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_duplicate_msg.json b/...pectest/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_duplicate_msg.json
diff --git a/...test/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_duplicate_signer.json b/...test/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_duplicate_signer.json
diff --git a/...ctest/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_future_instance.json b/...ctest/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_future_instance.json
diff --git a/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_has_quorum.json b/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_has_quorum.json
diff --git a/...est/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_invalid_full_data.json b/...est/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_invalid_full_data.json
diff --git a/.../spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_invalid_msg.json b/.../spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_invalid_msg.json
diff --git a/...te/tests/tests.ControllerSpecTest_qbft_controller_decide_invalid_value_(should_pass).json b/...te/tests/tests.ControllerSpecTest_qbft_controller_decide_invalid_value_(should_pass).json
diff --git a/...spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_late_decided.json b/...spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_late_decided.json
diff --git a/...ate/tests/tests.ControllerSpecTest_qbft_controller_decide_late_decided_bigger_quorum.json b/...ate/tests/tests.ControllerSpecTest_qbft_controller_decide_late_decided_bigger_quorum.json
diff --git a/...te/tests/tests.ControllerSpecTest_qbft_controller_decide_late_decided_smaller_quorum.json b/...te/tests/tests.ControllerSpecTest_qbft_controller_decide_late_decided_smaller_quorum.json
diff --git a/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_no_quorum.json b/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_no_quorum.json
diff --git a/...pectest/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_past_instance.json b/...pectest/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_past_instance.json
diff --git a/...ectest/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_unknown_signer.json b/...ectest/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_unknown_signer.json
diff --git a/...ectest/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_wrong_msg_type.json b/...ectest/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_wrong_msg_type.json
diff --git a/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_wrong_sig.json b/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_decide_wrong_sig.json
diff --git a/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_full_decided.json b/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_full_decided.json
diff --git a/...test/generate/tests/tests.ControllerSpecTest_qbft_controller_full_flow_after_decided.json b/...test/generate/tests/tests.ControllerSpecTest_qbft_controller_full_flow_after_decided.json
diff --git a/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_future_valid_msg.json b/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_future_valid_msg.json
diff --git a/.../spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_invalid_identifier.json b/.../spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_invalid_identifier.json
diff --git a/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_late_commit.json b/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_late_commit.json
diff --git a/...st/generate/tests/tests.ControllerSpecTest_qbft_controller_late_commit_past_instance.json b/...st/generate/tests/tests.ControllerSpecTest_qbft_controller_late_commit_past_instance.json
diff --git a/...ctest/generate/tests/tests.ControllerSpecTest_qbft_controller_late_commit_past_round.json b/...ctest/generate/tests/tests.ControllerSpecTest_qbft_controller_late_commit_past_round.json
diff --git a/...s/tests.ControllerSpecTest_qbft_controller_late_non_duplicate_proposal_past_instance.json b/...s/tests.ControllerSpecTest_qbft_controller_late_non_duplicate_proposal_past_instance.json
diff --git a/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_late_prepare.json b/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_late_prepare.json
diff --git a/...t/generate/tests/tests.ControllerSpecTest_qbft_controller_late_prepare_past_instance.json b/...t/generate/tests/tests.ControllerSpecTest_qbft_controller_late_prepare_past_instance.json
diff --git a/...test/generate/tests/tests.ControllerSpecTest_qbft_controller_late_prepare_past_round.json b/...test/generate/tests/tests.ControllerSpecTest_qbft_controller_late_prepare_past_round.json
diff --git a/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_late_proposal.json b/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_late_proposal.json
diff --git a/.../generate/tests/tests.ControllerSpecTest_qbft_controller_late_proposal_past_instance.json b/.../generate/tests/tests.ControllerSpecTest_qbft_controller_late_proposal_past_instance.json
diff --git a/...est/generate/tests/tests.ControllerSpecTest_qbft_controller_late_proposal_past_round.json b/...est/generate/tests/tests.ControllerSpecTest_qbft_controller_late_proposal_past_round.json
diff --git a/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_late_round_change.json b/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_late_round_change.json
diff --git a/...erate/tests/tests.ControllerSpecTest_qbft_controller_late_round_change_past_instance.json b/...erate/tests/tests.ControllerSpecTest_qbft_controller_late_round_change_past_instance.json
diff --git a/...generate/tests/tests.ControllerSpecTest_qbft_controller_late_round_change_past_round.json b/...generate/tests/tests.ControllerSpecTest_qbft_controller_late_round_change_past_round.json
diff --git a/...ctest/generate/tests/tests.ControllerSpecTest_qbft_controller_multi_decide_instances.json b/...ctest/generate/tests/tests.ControllerSpecTest_qbft_controller_multi_decide_instances.json
diff --git a/...spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_no_instance_running.json b/...spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_no_instance_running.json
diff --git a/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_process_msg_error.json b/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_process_msg_error.json
diff --git a/...pectest/generate/tests/tests.ControllerSpecTest_qbft_controller_single_consensus_msg.json b/...pectest/generate/tests/tests.ControllerSpecTest_qbft_controller_single_consensus_msg.json
diff --git a/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_sorted_decided.json b/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_sorted_decided.json
diff --git a/...te/tests/tests.ControllerSpecTest_qbft_controller_start_instance_post_future_decided.json b/...te/tests/tests.ControllerSpecTest_qbft_controller_start_instance_post_future_decided.json
diff --git a/.../generate/tests/tests.ControllerSpecTest_qbft_controller_start_instance_prev_decided.json b/.../generate/tests/tests.ControllerSpecTest_qbft_controller_start_instance_prev_decided.json
diff --git a/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_valid.json b/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_valid.json
diff --git a/.../tests.CreateMsgSpecTest_qbft_create_message_create_proposal_not_previously_prepared.json b/.../tests.CreateMsgSpecTest_qbft_create_message_create_proposal_not_previously_prepared.json
diff --git a/...ests/tests.CreateMsgSpecTest_qbft_create_message_create_proposal_previously_prepared.json b/...ests/tests.CreateMsgSpecTest_qbft_create_message_create_proposal_previously_prepared.json
diff --git a/...ts.CreateMsgSpecTest_qbft_create_message_create_round_change_no_justification_quorum.json b/...ts.CreateMsgSpecTest_qbft_create_message_create_round_change_no_justification_quorum.json
diff --git a/.../tests.CreateMsgSpecTest_qbft_create_message_create_round_change_previously_prepared.json b/.../tests.CreateMsgSpecTest_qbft_create_message_create_round_change_previously_prepared.json
diff --git a/...erate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_commit_current_round.json b/...erate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_commit_current_round.json
diff --git a/...gProcessingSpecTest_qbft_message_processing_commit_data_!=_acceptedProposalData.Data.json b/...gProcessingSpecTest_qbft_message_processing_commit_data_!=_acceptedProposalData.Data.json
diff --git a/...sts/tests.MsgProcessingSpecTest_qbft_message_processing_commit_data_!=_prepared_data.json b/...sts/tests.MsgProcessingSpecTest_qbft_message_processing_commit_data_!=_prepared_data.json
diff --git a/...nerate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_commit_future_round.json b/...nerate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_commit_future_round.json
diff --git a/...generate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_commit_happy_flow.json b/...generate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_commit_happy_flow.json
diff --git a/...e/tests/tests.MsgProcessingSpecTest_qbft_message_processing_commit_no_prepare_quorum.json b/...e/tests/tests.MsgProcessingSpecTest_qbft_message_processing_commit_no_prepare_quorum.json
diff --git a/...generate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_commit_past_round.json b/...generate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_commit_past_round.json
diff --git a/...essingSpecTest_qbft_message_processing_different_proposal_round_change_justification.json b/...essingSpecTest_qbft_message_processing_different_proposal_round_change_justification.json
diff --git a/...e/tests/tests.MsgProcessingSpecTest_qbft_message_processing_duplicate_commit_message.json b/...e/tests/tests.MsgProcessingSpecTest_qbft_message_processing_duplicate_commit_message.json
diff --git a/.../tests/tests.MsgProcessingSpecTest_qbft_message_processing_duplicate_prepare_message.json b/.../tests/tests.MsgProcessingSpecTest_qbft_message_processing_duplicate_prepare_message.json
diff --git a/...ts.MsgProcessingSpecTest_qbft_message_processing_duplicate_prepare_msg_justification.json b/...ts.MsgProcessingSpecTest_qbft_message_processing_duplicate_prepare_msg_justification.json
diff --git a/...rocessingSpecTest_qbft_message_processing_duplicate_prepare_msg_justification_quorum.json b/...rocessingSpecTest_qbft_message_processing_duplicate_prepare_msg_justification_quorum.json
diff --git a/...s/tests.MsgProcessingSpecTest_qbft_message_processing_duplicate_rc_msg_justification.json b/...s/tests.MsgProcessingSpecTest_qbft_message_processing_duplicate_rc_msg_justification.json
diff --git a/...ProcessingSpecTest_qbft_message_processing_duplicate_rc_msg_justification_(prepared).json b/...ProcessingSpecTest_qbft_message_processing_duplicate_rc_msg_justification_(prepared).json
diff --git a/...ingSpecTest_qbft_message_processing_duplicate_rc_msg_justification_(prepared)_quorum.json b/...ingSpecTest_qbft_message_processing_duplicate_rc_msg_justification_(prepared)_quorum.json
diff --git a/...generate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_duplicate_signers.json b/...generate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_duplicate_signers.json
diff --git a/...test/generate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_f+1_speed_up.json b/...test/generate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_f+1_speed_up.json
diff --git a/...tests/tests.MsgProcessingSpecTest_qbft_message_processing_f+1_speed_up_prev_prepared.json b/...tests/tests.MsgProcessingSpecTest_qbft_message_processing_f+1_speed_up_prev_prepared.json
diff --git a/.../tests/tests.MsgProcessingSpecTest_qbft_message_processing_force_stop_commit_message.json b/.../tests/tests.MsgProcessingSpecTest_qbft_message_processing_force_stop_commit_message.json
diff --git a/...tests/tests.MsgProcessingSpecTest_qbft_message_processing_force_stop_prepare_message.json b/...tests/tests.MsgProcessingSpecTest_qbft_message_processing_force_stop_prepare_message.json
diff --git a/...ests/tests.MsgProcessingSpecTest_qbft_message_processing_force_stop_proposal_message.json b/...ests/tests.MsgProcessingSpecTest_qbft_message_processing_force_stop_proposal_message.json
diff --git a/.../tests.MsgProcessingSpecTest_qbft_message_processing_force_stop_round_change_message.json b/.../tests.MsgProcessingSpecTest_qbft_message_processing_force_stop_round_change_message.json
diff --git a/...ectest/generate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_happy_flow.json b/...ectest/generate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_happy_flow.json
diff --git a/...tests/tests.MsgProcessingSpecTest_qbft_message_processing_happy_flow_seven_operators.json b/...tests/tests.MsgProcessingSpecTest_qbft_message_processing_happy_flow_seven_operators.json
diff --git a/...e/tests/tests.MsgProcessingSpecTest_qbft_message_processing_happy_flow_ten_operators.json b/...e/tests/tests.MsgProcessingSpecTest_qbft_message_processing_happy_flow_ten_operators.json
diff --git a/...ts/tests.MsgProcessingSpecTest_qbft_message_processing_happy_flow_thirteen_operators.json b/...ts/tests.MsgProcessingSpecTest_qbft_message_processing_happy_flow_thirteen_operators.json
diff --git a/...generate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_invalid_full_data.json b/...generate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_invalid_full_data.json
diff --git a/...ts.MsgProcessingSpecTest_qbft_message_processing_invalid_prepare_justification_round.json b/...ts.MsgProcessingSpecTest_qbft_message_processing_invalid_prepare_justification_round.json
diff --git a/...ts.MsgProcessingSpecTest_qbft_message_processing_invalid_prepare_justification_value.json b/...ts.MsgProcessingSpecTest_qbft_message_processing_invalid_prepare_justification_value.json
diff --git a/...sts/tests.MsgProcessingSpecTest_qbft_message_processing_invalid_proposal_value_check.json b/...sts/tests.MsgProcessingSpecTest_qbft_message_processing_invalid_proposal_value_check.json
diff --git a/...ests/tests.MsgProcessingSpecTest_qbft_message_processing_justification_duplicate_msg.json b/...ests/tests.MsgProcessingSpecTest_qbft_message_processing_justification_duplicate_msg.json
diff --git a/...ests/tests.MsgProcessingSpecTest_qbft_message_processing_justification_invalid_round.json b/...ests/tests.MsgProcessingSpecTest_qbft_message_processing_justification_invalid_round.json
diff --git a/.../tests/tests.MsgProcessingSpecTest_qbft_message_processing_justification_invalid_sig.json b/.../tests/tests.MsgProcessingSpecTest_qbft_message_processing_justification_invalid_sig.json
diff --git a/...tests/tests.MsgProcessingSpecTest_qbft_message_processing_justification_multi_signer.json b/...tests/tests.MsgProcessingSpecTest_qbft_message_processing_justification_multi_signer.json
diff --git a/...e/tests/tests.MsgProcessingSpecTest_qbft_message_processing_multi_signer,_no_overlap.json b/...e/tests/tests.MsgProcessingSpecTest_qbft_message_processing_multi_signer,_no_overlap.json
diff --git a/...tests/tests.MsgProcessingSpecTest_qbft_message_processing_multi_signer,_with_overlap.json b/...tests/tests.MsgProcessingSpecTest_qbft_message_processing_multi_signer,_with_overlap.json
diff --git a/.../generate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_no_commit_quorum.json b/.../generate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_no_commit_quorum.json
diff --git a/...sts/tests.MsgProcessingSpecTest_qbft_message_processing_no_prepare_quorum_(prepared).json b/...sts/tests.MsgProcessingSpecTest_qbft_message_processing_no_prepare_quorum_(prepared).json
diff --git a/...ts/tests.MsgProcessingSpecTest_qbft_message_processing_no_previous_accepted_proposal.json b/...ts/tests.MsgProcessingSpecTest_qbft_message_processing_no_previous_accepted_proposal.json
diff --git a/...tests.MsgProcessingSpecTest_qbft_message_processing_no_previous_proposal_for_prepare.json b/...tests.MsgProcessingSpecTest_qbft_message_processing_no_previous_proposal_for_prepare.json
diff --git a/...test/generate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_no_rc_quorum.json b/...test/generate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_no_rc_quorum.json
diff --git a/...te/tests/tests.MsgProcessingSpecTest_qbft_message_processing_no_rc_quorum_(prepared).json b/...te/tests/tests.MsgProcessingSpecTest_qbft_message_processing_no_rc_quorum_(prepared).json
diff --git a/...test/generate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_post_decided.json b/...test/generate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_post_decided.json
diff --git a/...erate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_prepare_future_round.json b/...erate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_prepare_future_round.json
diff --git a/...enerate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_prepare_happy_flow.json b/...enerate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_prepare_happy_flow.json
diff --git a/...erate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_prepare_multi_signer.json b/...erate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_prepare_multi_signer.json
diff --git a/...erate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_prepare_post_decided.json b/...erate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_prepare_post_decided.json
diff --git a/...enerate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_prepare_prev_round.json b/...enerate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_prepare_prev_round.json
diff --git a/...ate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_prepare_unknown_signer.json b/...ate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_prepare_unknown_signer.json
diff --git a/...enerate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_prepare_wrong_data.json b/...enerate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_prepare_wrong_data.json
diff --git a/...erate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_prepare_wrong_height.json b/...erate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_prepare_wrong_height.json
diff --git a/.../tests.MsgProcessingSpecTest_qbft_message_processing_prepared_quorum_committed_twice.json b/.../tests.MsgProcessingSpecTest_qbft_message_processing_prepared_quorum_committed_twice.json
diff --git a/...ocessingSpecTest_qbft_message_processing_prepared_quorum_committed_twice_late_commit.json b/...ocessingSpecTest_qbft_message_processing_prepared_quorum_committed_twice_late_commit.json
diff --git a/...sts/tests.MsgProcessingSpecTest_qbft_message_processing_previously_prepared_proposal.json b/...sts/tests.MsgProcessingSpecTest_qbft_message_processing_previously_prepared_proposal.json
diff --git a/...tests/tests.MsgProcessingSpecTest_qbft_message_processing_proposal_duplicate_message.json b/...tests/tests.MsgProcessingSpecTest_qbft_message_processing_proposal_duplicate_message.json
diff --git a/...rocessingSpecTest_qbft_message_processing_proposal_duplicate_message_different_value.json b/...rocessingSpecTest_qbft_message_processing_proposal_duplicate_message_different_value.json
diff --git a/...sts.MsgProcessingSpecTest_qbft_message_processing_proposal_first_round_justification.json b/...sts.MsgProcessingSpecTest_qbft_message_processing_proposal_first_round_justification.json
diff --git a/...sgProcessingSpecTest_qbft_message_processing_proposal_future_round_prev_not_prepared.json b/...sgProcessingSpecTest_qbft_message_processing_proposal_future_round_prev_not_prepared.json
diff --git a/...ts.MsgProcessingSpecTest_qbft_message_processing_proposal_future_round_prev_prepared.json b/...ts.MsgProcessingSpecTest_qbft_message_processing_proposal_future_round_prev_prepared.json
diff --git a/....MsgProcessingSpecTest_qbft_message_processing_proposal_justification_(not_prepared).json b/....MsgProcessingSpecTest_qbft_message_processing_proposal_justification_(not_prepared).json
diff --git a/...sts.MsgProcessingSpecTest_qbft_message_processing_proposal_justification_not_highest.json b/...sts.MsgProcessingSpecTest_qbft_message_processing_proposal_justification_not_highest.json
diff --git a/...rate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_proposal_multi_signer.json b/...rate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_proposal_multi_signer.json
diff --git a/...sgProcessingSpecTest_qbft_message_processing_proposal_past_round_(not_prev_prepared).json b/...sgProcessingSpecTest_qbft_message_processing_proposal_past_round_(not_prev_prepared).json
diff --git a/...rate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_proposal_post_decided.json b/...rate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_proposal_post_decided.json
diff --git a/...rate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_proposal_post_prepare.json b/...rate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_proposal_post_prepare.json
diff --git a/...te/tests/tests.MsgProcessingSpecTest_qbft_message_processing_proposal_rc_msg_invalid.json b/...te/tests/tests.MsgProcessingSpecTest_qbft_message_processing_proposal_rc_msg_invalid.json
diff --git a/...sts.MsgProcessingSpecTest_qbft_message_processing_proposal_rc_msg_invalid_(prepared).json b/...sts.MsgProcessingSpecTest_qbft_message_processing_proposal_rc_msg_invalid_(prepared).json
diff --git a/...tests/tests.MsgProcessingSpecTest_qbft_message_processing_quorum_not_triggered_twice.json b/...tests/tests.MsgProcessingSpecTest_qbft_message_processing_quorum_not_triggered_twice.json
diff --git a/...ingSpecTest_qbft_message_processing_quorum_not_triggered_twice_justification_ignored.json b/...ingSpecTest_qbft_message_processing_quorum_not_triggered_twice_justification_ignored.json
diff --git a/...s.MsgProcessingSpecTest_qbft_message_processing_round_change_after_proposal_accepted.json b/...s.MsgProcessingSpecTest_qbft_message_processing_round_change_after_proposal_accepted.json
diff --git a/...tests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_duplicate_msg.json b/...tests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_duplicate_msg.json
diff --git a/...ests.MsgProcessingSpecTest_qbft_message_processing_round_change_duplicate_msg_quorum.json b/...ests.MsgProcessingSpecTest_qbft_message_processing_round_change_duplicate_msg_quorum.json
diff --git a/...t_qbft_message_processing_round_change_duplicate_msg_quorum_(prev_prepared_rc_first).json b/...t_qbft_message_processing_round_change_duplicate_msg_quorum_(prev_prepared_rc_first).json
diff --git a/.../tests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_empty_signer.json b/.../tests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_empty_signer.json
diff --git a/...tests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_f+1_duplicate.json b/...tests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_f+1_duplicate.json
diff --git a/...sgProcessingSpecTest_qbft_message_processing_round_change_f+1_not_duplicate_prepared.json b/...sgProcessingSpecTest_qbft_message_processing_round_change_f+1_not_duplicate_prepared.json
diff --git a/...ts/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_f+1_not_prepared.json b/...ts/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_f+1_not_prepared.json
diff --git a/.../tests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_f+1_prepared.json b/.../tests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_f+1_prepared.json
diff --git a/...te/tests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_happy_flow.json b/...te/tests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_happy_flow.json
diff --git a/...ests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_invalid_height.json b/...ests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_invalid_height.json
diff --git a/...s.MsgProcessingSpecTest_qbft_message_processing_round_change_justification_no_quorum.json b/...s.MsgProcessingSpecTest_qbft_message_processing_round_change_justification_no_quorum.json
diff --git a/...sgProcessingSpecTest_qbft_message_processing_round_change_justification_not_proposer.json b/...sgProcessingSpecTest_qbft_message_processing_round_change_justification_not_proposer.json
diff --git a/...MsgProcessingSpecTest_qbft_message_processing_round_change_justification_wrong_round.json b/...MsgProcessingSpecTest_qbft_message_processing_round_change_justification_wrong_round.json
diff --git a/...tests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_multi_signers.json b/...tests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_multi_signers.json
diff --git a/...s/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_non_unique_signer.json b/...s/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_non_unique_signer.json
diff --git a/.../tests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_not_prepared.json b/.../tests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_not_prepared.json
diff --git a/...ests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_partial_quorum.json b/...ests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_partial_quorum.json
diff --git a/...te/tests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_past_round.json b/...te/tests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_past_round.json
diff --git a/...s/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_past_round_quorum.json b/...s/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_past_round_quorum.json
diff --git a/...tests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_peer_prepared.json b/...tests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_peer_prepared.json
diff --git a/...cessingSpecTest_qbft_message_processing_round_change_peer_prepared_different_heights.json b/...cessingSpecTest_qbft_message_processing_round_change_peer_prepared_different_heights.json
diff --git a/...rate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_prepared.json b/...rate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_prepared.json
diff --git a/...s.MsgProcessingSpecTest_qbft_message_processing_round_change_quorum_msg_not_prepared.json b/...s.MsgProcessingSpecTest_qbft_message_processing_round_change_quorum_msg_not_prepared.json
diff --git a/...ests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_quorum_order_1.json b/...ests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_quorum_order_1.json
diff --git a/...ests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_quorum_order_2.json b/...ests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_quorum_order_2.json
diff --git a/...ests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_unknown_signer.json b/...ests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_unknown_signer.json
diff --git a/...e/tests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_zero_signer.json b/...e/tests/tests.MsgProcessingSpecTest_qbft_message_processing_round_change_zero_signer.json
diff --git a/...ests/tests.MsgProcessingSpecTest_qbft_message_processing_round_cutoff_commit_message.json b/...ests/tests.MsgProcessingSpecTest_qbft_message_processing_round_cutoff_commit_message.json
diff --git a/...sts/tests.MsgProcessingSpecTest_qbft_message_processing_round_cutoff_prepare_message.json b/...sts/tests.MsgProcessingSpecTest_qbft_message_processing_round_cutoff_prepare_message.json
diff --git a/...ts/tests.MsgProcessingSpecTest_qbft_message_processing_round_cutoff_proposal_message.json b/...ts/tests.MsgProcessingSpecTest_qbft_message_processing_round_cutoff_proposal_message.json
diff --git a/...ests.MsgProcessingSpecTest_qbft_message_processing_round_cutoff_round_change_message.json b/...ests.MsgProcessingSpecTest_qbft_message_processing_round_cutoff_round_change_message.json
diff --git a/.../tests/tests.MsgProcessingSpecTest_qbft_message_processing_second_proposal_for_round.json b/.../tests/tests.MsgProcessingSpecTest_qbft_message_processing_second_proposal_for_round.json
diff --git a/...rate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_unknown_commit_signer.json b/...rate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_unknown_commit_signer.json
diff --git a/...te/tests/tests.MsgProcessingSpecTest_qbft_message_processing_unknown_proposal_signer.json b/...te/tests/tests.MsgProcessingSpecTest_qbft_message_processing_unknown_proposal_signer.json
diff --git a/...nerate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_valid_justification.json b/...nerate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_valid_justification.json
diff --git a/...nerate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_wrong_commit_height.json b/...nerate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_wrong_commit_height.json
diff --git a/...rate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_wrong_proposal_height.json b/...rate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_wrong_proposal_height.json
diff --git a/...st/generate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_wrong_proposer.json b/...st/generate/tests/tests.MsgProcessingSpecTest_qbft_message_processing_wrong_proposer.json
diff --git a/...est/generate/tests/tests.MsgSpecTest_qbft_message_SSZ_marshalling_of_signed_messaged.json b/...est/generate/tests/tests.MsgSpecTest_qbft_message_SSZ_marshalling_of_signed_messaged.json
diff --git a/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_commit_data_nil_or_len_0.json b/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_commit_data_nil_or_len_0.json
diff --git a/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_duplicate_signers.json b/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_duplicate_signers.json
diff --git a/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_get_root.json b/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_get_root.json
diff --git a/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_invalid_hash_data_root.json b/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_invalid_hash_data_root.json
diff --git a/...ate/tests/tests.MsgSpecTest_qbft_message_invalid_prepare_justification_unmarshalling.json b/...ate/tests/tests.MsgSpecTest_qbft_message_invalid_prepare_justification_unmarshalling.json
diff --git a/...ests/tests.MsgSpecTest_qbft_message_invalid_round_change_justification_unmarshalling.json b/...ests/tests.MsgSpecTest_qbft_message_invalid_round_change_justification_unmarshalling.json
diff --git a/.../generate/tests/tests.MsgSpecTest_qbft_message_marshal_RC_and_Prepare_justifications.json b/.../generate/tests/tests.MsgSpecTest_qbft_message_marshal_RC_and_Prepare_justifications.json
diff --git a/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_marshal_justifications.json b/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_marshal_justifications.json
diff --git a/.../generate/tests/tests.MsgSpecTest_qbft_message_marshal_justifications_with_full_data.json b/.../generate/tests/tests.MsgSpecTest_qbft_message_marshal_justifications_with_full_data.json
diff --git a/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_msg_identifier_len_==_0.json b/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_msg_identifier_len_==_0.json
diff --git a/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_msg_identifier_nil.json b/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_msg_identifier_nil.json
diff --git a/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_msg_type_unknown.json b/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_msg_type_unknown.json
diff --git a/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_multi_signers.json b/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_multi_signers.json
diff --git a/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_no_signers.json b/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_no_signers.json
diff --git a/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_prepare_data_encoding.json b/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_prepare_data_encoding.json
diff --git a/...st/generate/tests/tests.MsgSpecTest_qbft_message_prepare_justification_unmarshalling.json b/...st/generate/tests/tests.MsgSpecTest_qbft_message_prepare_justification_unmarshalling.json
diff --git a/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_propose_data_encoding.json b/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_propose_data_encoding.json
diff --git a/...st/generate/tests/tests.MsgSpecTest_qbft_message_rc_not_prev_prepared_justifications.json b/...st/generate/tests/tests.MsgSpecTest_qbft_message_rc_not_prev_prepared_justifications.json
diff --git a/...ectest/generate/tests/tests.MsgSpecTest_qbft_message_rc_prev_prepared_justifications.json b/...ectest/generate/tests/tests.MsgSpecTest_qbft_message_rc_prev_prepared_justifications.json
diff --git a/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_round_change_data_encoding.json b/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_round_change_data_encoding.json
diff --git a/...nerate/tests/tests.MsgSpecTest_qbft_message_round_change_justification_unmarshalling.json b/...nerate/tests/tests.MsgSpecTest_qbft_message_round_change_justification_unmarshalling.json
diff --git a/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_round_change_prepared.json b/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_round_change_prepared.json
diff --git a/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_signed_message_encoding.json b/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_signed_message_encoding.json
diff --git a/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_signer_0.json b/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_signer_0.json
diff --git a/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_unmarshal_justifications.json b/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_unmarshal_justifications.json
diff --git a/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_valid_hash_data_root.json b/qbft/spectest/generate/tests/tests.MsgSpecTest_qbft_message_valid_hash_data_root.json
diff --git a/qbft/spectest/generate/tests/timeout.SpecTest_qbft_timeout_round_1.json b/qbft/spectest/generate/tests/timeout.SpecTest_qbft_timeout_round_1.json
diff --git a/qbft/spectest/generate/tests/timeout.SpecTest_qbft_timeout_round_15.json b/qbft/spectest/generate/tests/timeout.SpecTest_qbft_timeout_round_15.json
diff --git a/qbft/spectest/generate/tests/timeout.SpecTest_qbft_timeout_round_2.json b/qbft/spectest/generate/tests/timeout.SpecTest_qbft_timeout_round_2.json
diff --git a/qbft/spectest/generate/tests/timeout.SpecTest_qbft_timeout_round_3.json b/qbft/spectest/generate/tests/timeout.SpecTest_qbft_timeout_round_3.json
diff --git a/qbft/spectest/generate/tests/timeout.SpecTest_qbft_timeout_round_5.json b/qbft/spectest/generate/tests/timeout.SpecTest_qbft_timeout_round_5.json
diff --git a/qbft/spectest/tests/commit/current_round.go b/qbft/spectest/tests/commit/current_round.go
@@ -17,7 +17,7 @@ func CurrentRound() tests.SpecTest {
 		testingutils.TestingCommitMessage(ks.OperatorKeys[1], types.OperatorID(1)),
 	}
 
-	return tests.NewMsgProcessingSpecTest(
+	test := tests.NewMsgProcessingSpecTest(
 		"commit current round",
 		testdoc.CommitTestCurrentRoundDoc,
 		pre,
@@ -27,5 +27,8 @@ func CurrentRound() tests.SpecTest {
 		nil,
 		"",
 		nil,
+		ks,
 	)
+
+	return test
 }
diff --git a/qbft/spectest/tests/commit/duplicate_msg.go b/qbft/spectest/tests/commit/duplicate_msg.go
@@ -19,7 +19,7 @@ func DuplicateMsg() tests.SpecTest {
 		testingutils.TestingCommitMessage(ks.OperatorKeys[1], 1),
 	}
 
-	return tests.NewMsgProcessingSpecTest(
+	test := tests.NewMsgProcessingSpecTest(
 		"duplicate commit message",
 		testdoc.CommitTestDuplicateMsgDoc,
 		pre,
@@ -29,5 +29,8 @@ func DuplicateMsg() tests.SpecTest {
 		nil,
 		"",
 		nil,
+		ks,
 	)
+
+	return test
 }
diff --git a/qbft/spectest/tests/commit/duplicate_signers.go b/qbft/spectest/tests/commit/duplicate_signers.go
@@ -18,7 +18,7 @@ func DuplicateSigners() tests.SpecTest {
 	commit := testingutils.TestingCommitMultiSignerMessage([]*rsa.PrivateKey{ks.OperatorKeys[1], ks.OperatorKeys[2]}, []types.OperatorID{1, 2})
 	commit.OperatorIDs = []types.OperatorID{1, 1}
 
-	return tests.NewMsgProcessingSpecTest(
+	test := tests.NewMsgProcessingSpecTest(
 		"duplicate signers",
 		testdoc.CommitTestDuplicateSignersDoc,
 		pre,
@@ -28,5 +28,8 @@ func DuplicateSigners() tests.SpecTest {
 		nil,
 		"invalid signed message: invalid SignedSSVMessage: non unique signer",
 		nil,
+		ks,
 	)
+
+	return test
 }
diff --git a/qbft/spectest/tests/commit/force_stop.go b/qbft/spectest/tests/commit/force_stop.go
@@ -19,7 +19,7 @@ func ForceStop() tests.SpecTest {
 		testingutils.TestingCommitMessage(ks.OperatorKeys[1], types.OperatorID(1)),
 	}
 
-	return tests.NewMsgProcessingSpecTest(
+	test := tests.NewMsgProcessingSpecTest(
 		"force stop commit message",
 		testdoc.CommitTestForceStopDoc,
 		pre,
@@ -29,5 +29,8 @@ func ForceStop() tests.SpecTest {
 		nil,
 		"instance stopped processing messages",
 		nil,
+		ks,
 	)
+
+	return test
 }
diff --git a/qbft/spectest/tests/commit/future_round.go b/qbft/spectest/tests/commit/future_round.go
@@ -17,7 +17,7 @@ func FutureRound() tests.SpecTest {
 		testingutils.TestingCommitMessageWithRound(ks.OperatorKeys[1], 1, 2),
 	}
 
-	return tests.NewMsgProcessingSpecTest(
+	test := tests.NewMsgProcessingSpecTest(
 		"commit future round",
 		testdoc.CommitTestFutureRoundDoc,
 		pre,
@@ -27,5 +27,8 @@ func FutureRound() tests.SpecTest {
 		nil,
 		"invalid signed message: wrong msg round",
 		nil,
+		ks,
 	)
+
+	return test
 }
diff --git a/qbft/spectest/tests/commit/happy_flow.go b/qbft/spectest/tests/commit/happy_flow.go
@@ -29,7 +29,7 @@ func HappyFlow() tests.SpecTest {
 		testingutils.TestingCommitMessage(ks.OperatorKeys[1], 1),
 	}
 
-	return tests.NewMsgProcessingSpecTest(
+	test := tests.NewMsgProcessingSpecTest(
 		"commit happy flow",
 		testdoc.CommitTestHappyFlowDoc,
 		pre,
@@ -39,5 +39,8 @@ func HappyFlow() tests.SpecTest {
 		outputMsgs,
 		"",
 		nil,
+		ks,
 	)
+
+	return test
 }
diff --git a/qbft/spectest/tests/commit/invalid_val_check_quorum.go b/qbft/spectest/tests/commit/invalid_val_check_quorum.go
@@ -22,5 +22,6 @@ func InvalidValCheck() tests.SpecTest {
 		nil,
 		"",
 		nil,
+		nil,
 	)
 }
diff --git a/qbft/spectest/tests/commit/multi_signer_no_overlap.go b/qbft/spectest/tests/commit/multi_signer_no_overlap.go
@@ -30,7 +30,7 @@ func MultiSignerNoOverlap() tests.SpecTest {
 		testingutils.TestingCommitMessage(ks.OperatorKeys[1], 1),
 	}
 
-	return tests.NewMsgProcessingSpecTest(
+	test := tests.NewMsgProcessingSpecTest(
 		"multi signer, no overlap",
 		testdoc.CommitTestMultiSignerNoOverlapDoc,
 		pre,
@@ -40,5 +40,8 @@ func MultiSignerNoOverlap() tests.SpecTest {
 		outputMsgs,
 		"invalid signed message: msg allows 1 signer",
 		nil,
+		ks,
 	)
+
+	return test
 }
diff --git a/qbft/spectest/tests/commit/multi_signer_with_overlap.go b/qbft/spectest/tests/commit/multi_signer_with_overlap.go
@@ -31,7 +31,7 @@ func MultiSignerWithOverlap() tests.SpecTest {
 		testingutils.TestingCommitMessage(ks.OperatorKeys[1], 1),
 	}
 
-	return tests.NewMsgProcessingSpecTest(
+	test := tests.NewMsgProcessingSpecTest(
 		"multi signer, with overlap",
 		testdoc.CommitTestMultiSignerWithOverlapDoc,
 		pre,
@@ -41,5 +41,8 @@ func MultiSignerWithOverlap() tests.SpecTest {
 		outputMsgs,
 		"invalid signed message: msg allows 1 signer",
 		nil,
+		ks,
 	)
+
+	return test
 }
diff --git a/qbft/spectest/tests/commit/no_commit_quorum.go b/qbft/spectest/tests/commit/no_commit_quorum.go
@@ -31,7 +31,7 @@ func NoCommitQuorum() tests.SpecTest {
 		testingutils.TestingCommitMessage(ks.OperatorKeys[1], 1),
 	}
 
-	return tests.NewMsgProcessingSpecTest(
+	test := tests.NewMsgProcessingSpecTest(
 		"no commit quorum",
 		testdoc.CommitTestNoCommitQuorumDoc,
 		pre,
@@ -41,7 +41,10 @@ func NoCommitQuorum() tests.SpecTest {
 		outputMsgs,
 		"",
 		nil,
+		ks,
 	)
+
+	return test
 }
 
 func NoCommitQuorumStateComparison() *comparable.StateComparison {

diff --git a/qbft/spectest/tests/commit/no_prepare_quorum.go b/qbft/spectest/tests/commit/no_prepare_quorum.go
@@ -28,7 +28,7 @@ func NoPrepareQuorum() tests.SpecTest {
 		testingutils.TestingPrepareMessage(ks.OperatorKeys[1], 1),
 	}
 
-	return tests.NewMsgProcessingSpecTest(
+	test := tests.NewMsgProcessingSpecTest(
 		"commit no prepare quorum",
 		testdoc.CommitTestNoPrepareQuorumDoc,
 		pre,
@@ -38,5 +38,8 @@ func NoPrepareQuorum() tests.SpecTest {
 		outputMsgs,
 		"",
 		nil,
+		ks,
 	)
+
+	return test
 }
diff --git a/qbft/spectest/tests/commit/no_prev_proposal_accepted.go b/qbft/spectest/tests/commit/no_prev_proposal_accepted.go
@@ -17,7 +17,7 @@ func NoPrevAcceptedProposal() tests.SpecTest {
 		testingutils.TestingCommitMessage(ks.OperatorKeys[1], 1),
 	}
 
-	return tests.NewMsgProcessingSpecTest(
+	test := tests.NewMsgProcessingSpecTest(
 		"no previous accepted proposal",
 		testdoc.CommitTestNoPrevAcceptedProposalDoc,
 		pre,
@@ -27,5 +27,8 @@ func NoPrevAcceptedProposal() tests.SpecTest {
 		nil,
 		"invalid signed message: did not receive proposal for this round",
 		nil,
+		ks,
 	)
+
+	return test
 }
diff --git a/qbft/spectest/tests/commit/past_round.go b/qbft/spectest/tests/commit/past_round.go
@@ -19,7 +19,7 @@ func PastRound() tests.SpecTest {
 		testingutils.TestingCommitMessageWithRound(ks.OperatorKeys[1], 1, 2),
 	}
 
-	return tests.NewMsgProcessingSpecTest(
+	test := tests.NewMsgProcessingSpecTest(
 		"commit past round",
 		testdoc.CommitTestPastRoundDoc,
 		pre,
@@ -29,5 +29,8 @@ func PastRound() tests.SpecTest {
 		nil,
 		"invalid signed message: past round",
 		nil,
+		ks,
 	)
+
+	return test
 }
diff --git a/qbft/spectest/tests/commit/post_cutoff.go b/qbft/spectest/tests/commit/post_cutoff.go
@@ -18,7 +18,7 @@ func PostCutoff() tests.SpecTest {
 		testingutils.TestingCommitMessageWithRound(ks.OperatorKeys[1], types.OperatorID(1), 15),
 	}
 
-	return tests.NewMsgProcessingSpecTest(
+	test := tests.NewMsgProcessingSpecTest(
 		"round cutoff commit message",
 		testdoc.CommitTestPostCutoffDoc,
 		pre,
@@ -28,5 +28,8 @@ func PostCutoff() tests.SpecTest {
 		nil,
 		"instance stopped processing messages",
 		nil,
+		ks,
 	)
+
+	return test
 }
diff --git a/qbft/spectest/tests/commit/post_decided.go b/qbft/spectest/tests/commit/post_decided.go
@@ -21,7 +21,7 @@ func PostDecided() tests.SpecTest {
 		testingutils.TestingCommitMessage(ks.OperatorKeys[4], 4),
 	}
 
-	return tests.NewMsgProcessingSpecTest(
+	test := tests.NewMsgProcessingSpecTest(
 		"post decided",
 		testdoc.CommitTestPostDecidedDoc,
 		pre,
@@ -31,5 +31,8 @@ func PostDecided() tests.SpecTest {
 		nil,
 		"",
 		nil,
+		ks,
 	)
+
+	return test
 }
diff --git a/qbft/spectest/tests/commit/sorted_decided.go b/qbft/spectest/tests/commit/sorted_decided.go
@@ -13,7 +13,7 @@ import (
 func SortedDecided() tests.SpecTest {
 	ks := testingutils.Testing4SharesSet()
 
-	return tests.NewControllerSpecTest(
+	test := tests.NewControllerSpecTest(
 		"sorted decided",
 		testdoc.CommitTestSortedDecidedDoc,
 		[]*tests.RunInstanceData{
@@ -40,5 +40,8 @@ func SortedDecided() tests.SpecTest {
 		nil,
 		"",
 		nil,
+		ks,
 	)
+
+	return test
 }
diff --git a/qbft/spectest/tests/commit/unknwon_signer.go b/qbft/spectest/tests/commit/unknwon_signer.go
@@ -27,7 +27,7 @@ func UnknownSigner() tests.SpecTest {
 		testingutils.TestingCommitMessage(ks.OperatorKeys[1], 1),
 	}
 
-	return tests.NewMsgProcessingSpecTest(
+	test := tests.NewMsgProcessingSpecTest(
 		"unknown commit signer",
 		testdoc.CommitTestUnknownSignerDoc,
 		pre,
@@ -37,5 +37,8 @@ func UnknownSigner() tests.SpecTest {
 		outputMsgs,
 		"invalid signed message: signer not in committee",
 		nil,
+		ks,
 	)
+
+	return test
 }
diff --git a/qbft/spectest/tests/commit/wrong_data.go b/qbft/spectest/tests/commit/wrong_data.go
@@ -18,7 +18,7 @@ func WrongData1() tests.SpecTest {
 		testingutils.TestingCommitMessageWrongRoot(ks.OperatorKeys[1], 1),
 	}
 
-	return tests.NewMsgProcessingSpecTest(
+	test := tests.NewMsgProcessingSpecTest(
 		"commit data != acceptedProposalData.Data",
 		testdoc.CommitTestWrongData1Doc,
 		pre,
@@ -28,5 +28,8 @@ func WrongData1() tests.SpecTest {
 		nil,
 		"invalid signed message: proposed data mismatch",
 		nil,
+		ks,
 	)
+
+	return test
 }
diff --git a/qbft/spectest/tests/commit/wrong_data2.go b/qbft/spectest/tests/commit/wrong_data2.go
@@ -27,7 +27,7 @@ func WrongData2() tests.SpecTest {
 		testingutils.TestingCommitMessage(ks.OperatorKeys[1], 1),
 	}
 
-	return tests.NewMsgProcessingSpecTest(
+	test := tests.NewMsgProcessingSpecTest(
 		"commit data != prepared data",
 		testdoc.CommitTestWrongData2Doc,
 		pre,
@@ -37,5 +37,8 @@ func WrongData2() tests.SpecTest {
 		outputMsgs,
 		"invalid signed message: proposed data mismatch",
 		nil,
+		ks,
 	)
+
+	return test
 }
diff --git a/qbft/spectest/tests/commit/wrong_height.go b/qbft/spectest/tests/commit/wrong_height.go
@@ -27,7 +27,7 @@ func WrongHeight() tests.SpecTest {
 		testingutils.TestingCommitMessage(ks.OperatorKeys[1], 1),
 	}
 
-	return tests.NewMsgProcessingSpecTest(
+	test := tests.NewMsgProcessingSpecTest(
 		"wrong commit height",
 		testdoc.CommitTestWrongHeightDoc,
 		pre,
@@ -37,5 +37,8 @@ func WrongHeight() tests.SpecTest {
 		outputMsgs,
 		"invalid signed message: wrong msg height",
 		nil,
+		ks,
 	)
+
+	return test
 }
diff --git a/qbft/spectest/tests/controller/decided/current_instance.go b/qbft/spectest/tests/controller/decided/current_instance.go
@@ -16,7 +16,7 @@ func CurrentInstance() tests.SpecTest {
 	ks := testingutils.Testing4SharesSet()
 	sc := currentInstanceStateComparison()
 
-	return tests.NewControllerSpecTest(
+	test := tests.NewControllerSpecTest(
 		"decide current instance",
 		testdoc.ControllerDecidedCurrentInstanceDoc,
 		[]*tests.RunInstanceData{
@@ -47,7 +47,10 @@ func CurrentInstance() tests.SpecTest {
 		nil,
 		"",
 		nil,
+		ks,
 	)
+
+	return test
 }
 
 func currentInstanceStateComparison() *comparable.StateComparison {

diff --git a/qbft/spectest/tests/controller/decided/current_instance_future_round.go b/qbft/spectest/tests/controller/decided/current_instance_future_round.go
@@ -12,7 +12,7 @@ import (
 // CurrentInstanceFutureRound tests a decided msg received for current running instance for a future round
 func CurrentInstanceFutureRound() tests.SpecTest {
 	ks := testingutils.Testing4SharesSet()
-	return tests.NewControllerSpecTest(
+	test := tests.NewControllerSpecTest(
 		"decide current instance future round",
 		testdoc.ControllerDecidedCurrentInstanceFutureRoundDoc,
 		[]*tests.RunInstanceData{
@@ -36,5 +36,8 @@ func CurrentInstanceFutureRound() tests.SpecTest {
 		nil,
 		"",
 		nil,
+		ks,
 	)
+
+	return test
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,6 +69,7 @@ func main() { @@
     		if err != nil {
     			panic(errors.Wrapf(err, "failed to get post state for test: %s", test.TestName()).Error())
     		}
     		writeJsonStateComparison(test.TestName(), reflect.TypeOf(test).String(), post)
     	}
     }
@@ Expand Down @@