diff --git a/internal/consensus/state_test.go b/internal/consensus/state_test.go
index 716c2181a..6d4baa742 100644
--- a/internal/consensus/state_test.go
+++ b/internal/consensus/state_test.go
@@ -40,7 +40,9 @@ x * TestStateLock_POLUpdateLock - 4 vals, one precommits,
 other 3 polka at next round, so we unlock and precomit the polka
 x * TestStateLock_POLRelock - 4 vals, polka in round 1 and polka in round 2.
 Ensure validator updates locked round.
-x_*_TestStateLock_POLDoesNotUnlock 4 vals, one precommits, other 3 polka nil at next round, so we precommit nil but maintain lock
+x_*_TestStateLock_POLDoesNotUnlock 4 vals, one precommits, other 3 polka nil at
+next round, so we precommit nil but maintain lock
+>>>>>>> wb/proposer-based-timestamps
 x * TestStateLock_MissingProposalWhenPOLSeenDoesNotUpdateLock - 4 vals, 1 misses proposal but sees POL.
 x * TestStateLock_MissingProposalWhenPOLSeenDoesNotUnlock - 4 vals, 1 misses proposal but sees POL.
 x * TestStateLock_POLSafety1 - 4 vals. We shouldn't change lock based on polka at earlier round
@@ -892,6 +894,12 @@ func TestStateLock_PrevoteNilWhenLockedAndMissProposal(t *testing.T) {
 // if it is locked on a block and misses the proposal in a round.
 func TestStateLock_PrevoteNilWhenLockedAndDifferentProposal(t *testing.T) {
 	config := configSetup(t)
+	/*
+		All of the assertions in this test occur on the `cs1` validator.
+		The test sends signed votes from the other validators to cs1 and
+		cs1's state is then examined to verify that it now matches the expected
+		state.
+	*/
 
 	cs1, vss := randState(config, 4)
 	vs2, vs3, vs4 := vss[1], vss[2], vss[3]
@@ -1204,10 +1212,6 @@ func TestStateLock_MissingProposalWhenPOLSeenDoesNotUpdateLock(t *testing.T) {
 func TestStateLock_DoesNotLockOnOldProposal(t *testing.T) {
 	config := configSetup(t)
 
-	cs1, vss := randState(config, 4)
-	vs2, vs3, vs4 := vss[1], vss[2], vss[3]
-	height, round := cs1.Height, cs1.Round
-
 	timeoutWaitCh := subscribe(cs1.eventBus, types.EventQueryTimeoutWait)
 	proposalCh := subscribe(cs1.eventBus, types.EventQueryCompleteProposal)
 	pv1, err := cs1.privValidator.GetPubKey(context.Background())