diff --git a/Dockerfile b/Dockerfile
index e8ad65a81c..7f58c49632 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,7 +36,7 @@ FROM informalofftermatt/cometmock:latest as cometmock-builder
 # Get GoRelayer
 FROM informalofftermatt/gorelayer:nogas AS gorelayer-builder
 
-FROM --platform=linux/arm64 fedora:36
+FROM --platform=linux/amd64 fedora:36
 RUN dnf update -y
 RUN dnf install -y which iproute iputils procps-ng vim-minimal tmux net-tools htop jq
 USER root
diff --git a/tests/e2e/main.go b/tests/e2e/main.go
index 1f8ca6fdd4..7428e14cb5 100644
--- a/tests/e2e/main.go
+++ b/tests/e2e/main.go
@@ -57,11 +57,11 @@ func main() {
 	}
 
 	testRuns := []testRunWithSteps{
-		// {ChangeoverTestRun(), changeoverSteps},
-		// {DefaultTestRun(), happyPathSteps},
-		// {DemocracyTestRun(true), democracySteps},
-		// {DemocracyTestRun(false), rewardDenomConsumerSteps},
-		// {SlashThrottleTestRun(), slashThrottleSteps},
+		{ChangeoverTestRun(), changeoverSteps},
+		{DefaultTestRun(), happyPathSteps},
+		{DemocracyTestRun(true), democracySteps},
+		{DemocracyTestRun(false), rewardDenomConsumerSteps},
+		{SlashThrottleTestRun(), slashThrottleSteps},
 		{ConsumerMisbehaviourTestRun(), consumerMisbehaviourSteps},
 		{DefaultTestRun(), consumerDoubleSignSteps},
 	}
diff --git a/tests/integration/misbehaviour.go b/tests/integration/misbehaviour.go
index 02cd02128d..0768c4a37a 100644
--- a/tests/integration/misbehaviour.go
+++ b/tests/integration/misbehaviour.go
@@ -95,15 +95,6 @@ func (s *CCVTestSuite) TestGetByzantineValidators() {
 	altSigners[clientTMValset.Validators[1].Address.String()] = clientSigners[clientTMValset.Validators[1].Address.String()]
 	altSigners[clientTMValset.Validators[2].Address.String()] = clientSigners[clientTMValset.Validators[2].Address.String()]
 
-	// maliciousSigner := tmtypes.NewMockPV()
-
-	// // Create a subset of the consumer client validator set
-	// altValset2 := tmtypes.NewValidatorSet(s.consumerChain.Vals.Validators[0:3])
-	// altSigners2 := make(map[string]tmtypes.PrivValidator, 3)
-	// altSigners2[clientTMValset.Validators[0].Address.String()] = clientSigners[clientTMValset.Validators[0].Address.String()]
-	// altSigners2[clientTMValset.Validators[1].Address.String()] = clientSigners[clientTMValset.Validators[1].Address.String()]
-	// altSigners2[clientTMValset.Validators[2].Address.String()] = maliciousSigner
-
 	// create a consumer client header
 	clientHeader := s.consumerChain.CreateTMClientHeader(
 		s.consumerChain.ChainID,
@@ -350,7 +341,7 @@ func (s *CCVTestSuite) TestCheckMisbehaviour() {
 	altSigners[clientTMValset.Validators[0].Address.String()] = clientSigners[clientTMValset.Validators[0].Address.String()]
 	altSigners[clientTMValset.Validators[1].Address.String()] = clientSigners[clientTMValset.Validators[1].Address.String()]
 
-	// create an alternative validator set using less 1/3 of the trusted validator set
+	// create an alternative validator set using less than 1/3 of the trusted validator set
 	altValset2 := tmtypes.NewValidatorSet(s.consumerChain.Vals.Validators[0:1])
 	altSigners2 := make(map[string]tmtypes.PrivValidator, 1)
 	altSigners2[clientTMValset.Validators[0].Address.String()] = clientSigners[clientTMValset.Validators[0].Address.String()]
diff --git a/testutil/crypto/evidence.go b/testutil/crypto/evidence.go
index 6759b0e052..fef4ed768b 100644
--- a/testutil/crypto/evidence.go
+++ b/testutil/crypto/evidence.go
@@ -92,8 +92,8 @@ func MakeAndSignVoteWithForgedValAddress(
 	return vote
 }
 
-// CorruptCommitSigsInHeader corrupts the header by changing the value of the commit signature
-// given validator address
+// CorruptCommitSigsInHeader corrupts the header by changing the value
+// of the commit signature for given validator address.
 // Note that this method is solely used for testing purposes
 func CorruptCommitSigsInHeader(header *ibctmtypes.Header, valAddress bytes.HexBytes) {
 	commit, err := tmtypes.CommitFromProto(header.Commit)
@@ -112,7 +112,7 @@ func CorruptCommitSigsInHeader(header *ibctmtypes.Header, valAddress bytes.HexBy
 }
 
 // CorruptValidatorPubkeyInHeader corrupts the header by changing the validator pubkey
-// of the given validator address in the validator set
+// of the given validator address in the validator set.
 // Note that this method is solely used for testing purposes
 func CorruptValidatorPubkeyInHeader(header *ibctmtypes.Header, valAddress bytes.HexBytes) {
 	valset, err := tmtypes.ValidatorSetFromProto(header.ValidatorSet)