diff --git a/Makefile b/Makefile
index 88f17dcf9..5be5ce4fe 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ clean:
 
 # runs a limited set of tests against a minimal config
 # run pytest with `-m` option to full suite
-test:
+test: clean $(BUILD_DIR)/phase0
 	pytest -m minimal_config tests/
 
 
diff --git a/specs/core/0_beacon-chain.md b/specs/core/0_beacon-chain.md
index 1e9aa4308..4e1bcab16 100644
--- a/specs/core/0_beacon-chain.md
+++ b/specs/core/0_beacon-chain.md
@@ -1860,6 +1860,8 @@ def process_crosslinks(state: BeaconState) -> None:
     previous_epoch = max(current_epoch - 1, GENESIS_EPOCH)
     next_epoch = current_epoch + 1
 
+    state.previous_crosslinks = [crosslink for crosslink in state.current_crosslinks]
+
     for slot in range(get_epoch_start_slot(previous_epoch), get_epoch_start_slot(next_epoch)):
         for crosslink_committee, shard in get_crosslink_committees_at_slot(state, slot):
             winning_root, participants = get_winning_root_and_participants(state, slot, shard)
@@ -1870,8 +1872,6 @@ def process_crosslinks(state: BeaconState) -> None:
                     epoch=min(slot_to_epoch(slot), state.current_crosslinks[shard].epoch + MAX_CROSSLINK_EPOCHS),
                     crosslink_data_root=winning_root,
                 )
-
-    state.previous_crosslinks = state.current_crosslinks
 ```
 
 #### Eth1 data