diff --git a/specs/core/0_beacon-chain.md b/specs/core/0_beacon-chain.md
index 3dd4c944c..295064f77 100644
--- a/specs/core/0_beacon-chain.md
+++ b/specs/core/0_beacon-chain.md
@@ -921,9 +921,9 @@ def generate_seed(state: BeaconState,
 ```python
 def get_beacon_proposer_index(state: BeaconState) -> ValidatorIndex:
     """
-    Return the beacon proposer index at ``slot``.
+    Return the beacon proposer index at ``state.slot``.
     """
-    current_epoch = slot_to_epoch(state.slot)
+    current_epoch = get_current_epoch(state)
     first_committee, _ = get_crosslink_committees_at_slot(state, state.slot)[0]
     MAX_RANDOM_BYTE = 2**8 - 1
     i = 0
diff --git a/test_libs/pyspec/tests/block_processing/test_process_transfer.py b/test_libs/pyspec/tests/block_processing/test_process_transfer.py
index 65df822de..0eeaa7792 100644
--- a/test_libs/pyspec/tests/block_processing/test_process_transfer.py
+++ b/test_libs/pyspec/tests/block_processing/test_process_transfer.py
@@ -73,7 +73,7 @@ def test_success_withdrawable(state):
 def test_success_active_above_max_effective(state):
     sender_index = get_active_validator_indices(state, get_current_epoch(state))[-1]
     amount = spec.MAX_EFFECTIVE_BALANCE // 32
-    state.validator_registry[sender_index] = spec.MAX_EFFECTIVE_BALANCE + amount
+    state.balances[sender_index] = spec.MAX_EFFECTIVE_BALANCE + amount
     transfer = get_valid_transfer(state, sender_index=sender_index, amount=amount, fee=0)
 
     pre_state, post_state = run_transfer_processing(state, transfer)
@@ -84,7 +84,7 @@ def test_success_active_above_max_effective(state):
 def test_active_but_transfer_past_effective_balance(state):
     sender_index = get_active_validator_indices(state, get_current_epoch(state))[-1]
     amount = spec.MAX_EFFECTIVE_BALANCE // 32
-    state.validator_registry[sender_index] = spec.MAX_EFFECTIVE_BALANCE
+    state.balances[sender_index] = spec.MAX_EFFECTIVE_BALANCE
     transfer = get_valid_transfer(state, sender_index=sender_index, amount=amount, fee=0)
 
     pre_state, post_state = run_transfer_processing(state, transfer, False)
@@ -105,7 +105,7 @@ def test_incorrect_slot(state):
 def test_insufficient_balance(state):
     sender_index = get_active_validator_indices(state, get_current_epoch(state))[-1]
     amount = spec.MAX_EFFECTIVE_BALANCE
-    state.validator_registry[sender_index] = spec.MAX_EFFECTIVE_BALANCE
+    state.balances[sender_index] = spec.MAX_EFFECTIVE_BALANCE
     transfer = get_valid_transfer(state, sender_index=sender_index, amount=amount + 1, fee=0)
 
     # un-activate so validator can transfer