Repository: ethereum/consensus-specs

Issue:
Attestation validation differences between fork choice and process_attestation
An attestation contains three votes: LMD GHOST vote, FFG vote and Crosslink vote.
The beacon chain specs specify how to validate an attestation and its votes.
However, the validation is split in several parts: some checks defined in [fork_choice/on_attestation](https://github.com/ethereum/eth2.0-specs/blob/dev/specs/core/0_fork-choice.md#on_attestation) and others - in [process_attestation](https://github.com/ethereum/eth2.0-specs/blob/dev/specs/core/0_beacon-chain.md#attestations). They both invoke [is_valid_indexed_attestation](https://github.com/ethereum/eth2.0-specs/blob/dev/specs/core/0_beacon-chain.md#is_valid_indexed_attestation).

The `on_attestation` deals mostly with LMD GHOST vote and part of FFG vote (`target` field). So, if there arrives an attestation with an invalid crosslink vote or an invalid `source` fields, then it is still accepted by the fork choice spec and affects the LMD GHOST fork choice.
However, the attestation should not be included in newly proposed blocks, since it won't pass `process_attestation` checks (see [validator spec](https://github.com/ethereum/eth2.0-specs/blob/dev/specs/validator/0_beacon-chain-validator.md#attestations).

While there may be reasons to split validation in two parts, this can lead to inconsistencies in fork choice. Consider a case, when there are two head candidates, both having the same amount of votes and tie break chooses the first one. If a partially correct attestation added, which votes for the second block, then the second block becomes the head, based on off-chain plus on-chain attestation. But since this last vote cannot be incorporated into the chain, from on-chain attestations perspective, the first candidate is the head. I do not fully understand consequences of the discrepancy, but it seems awkward at least.

Another example. If such a partially valid attestations is propagated only to part of the network nodes, it cannot reach other (honest) validators via proposed blocks, because of `process_attestation` assertion failures. It can result in different views on the state of the blockchain, which can be only corrected by propagating such invalid attestations to other nodes.
So this looks like a potential unnecessary source of forks, which can be exploited by an attacker.


Discussion:
There are multiple things to consider here:

There is a related thing with "should we verify twice"; I'm heavily opposed to doing a single-pass verification of the attestation for several reasons:
- relying on your pool of operations is bad. Bitcoin Core had a bug where consensus was partially reliant on the mempool being validated (iirc).
- the fork-choice is different from the state transition, since voting is not the only thing happening with attestation, more on this below. Fork-choice can just verify the format, and the weight, and it is valid enough.

Fork-choice accepting partially invalid attestations is not that bad. If an attestation has weight and is signed, it still helps determine the head. We shouldn't rely too much on full state details being available to process it in a large graph of forks.
And if the attestation is really bad, it can be slashed. It having an invalid crosslink may hurt it for the attesters economical purposes as it won't get included on-chain, but it won't hurt the chain itself.

> Fork-choice accepting partially invalid attestations is not that bad.

We might want to have same inputs for the fork choice disregard the source of attestations. I.e. it should have no matter whether attestation was gossiped or came within one of the blocks. If fork choice doesn't run those checks then we may get different heads depending on attestation source. 

Also, if you've checked signature, don't you already have a state to check crosslink and checkpoits?

There are two cases with partially valid attestations:
* block-wise invalid but fork-choice-wise valid attestation, i.e. which affects fork choice, but cannot be included in a block
* fork-choice-wise invalid but block-wise valid attestation, i.e. which can be included in a block, but shouldn't affect fork choice (of honest validators)

The second case doesn't look like a problem - the block is used as a transport for attestations, and invalid ones will be filtered out in on_attestation method. They could have come from wire as plain messages as well.

The first cases looks like a problem, since attestations affecting fork choice cannot be persisted, i.e. included in the block chain. And will be forgotten eventually. So, if an impact of such partially valid attestations is significant (i.e. leading to a situation where an alternate block becomes the head), then it looks like somewhat severe problem. Since the on-chain information cannot explain the choice made, in some cases.

Resolving patch:
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -108,7 +108,7 @@ def get_spec(file_name: str) -> SpecObject:
 PHASE1_IMPORTS = '''from eth2spec.phase0 import spec as phase0
 from eth2spec.config.config_util import apply_constants_config
 from typing import (
-    Any, Dict, Set, Sequence, NewType, Tuple, TypeVar, Callable
+    Any, Dict, Set, Sequence, NewType, Tuple, TypeVar, Callable, Optional
 )
 
 from dataclasses import (
@@ -146,8 +146,11 @@ def ceillog2(x: uint64) -> int:
 hash_cache: Dict[bytes, Bytes32] = {}
 
 
-def get_eth1_data(distance: uint64) -> Bytes32:
-    return hash(distance)
+def get_eth1_data(block: Eth1Block) -> Eth1Data:
+    """
+    A stub function return mocking Eth1Data.
+    """
+    return Eth1Data(block_hash=hash_tree_root(block))
 
 
 def hash(x: bytes) -> Bytes32:  # type: ignore
@@ -373,6 +376,7 @@ def finalize_options(self):
                 self.md_doc_paths = """
                     specs/phase0/beacon-chain.md
                     specs/phase0/fork-choice.md
+                    specs/phase0/validator.md
                     specs/phase1/custody-game.md
                     specs/phase1/beacon-chain.md
                     specs/phase1/shard-transition.md
@@ -497,7 +501,7 @@ def run(self):
         "eth-utils>=1.3.0,<2",
         "eth-typing>=2.1.0,<3.0.0",
         "pycryptodome==3.9.4",
-        "py_ecc==2.0.0",
+        "py_ecc==4.0.0",
         "dataclasses==0.6",
         "remerkleable==0.1.13",
         "ruamel.yaml==0.16.5",


Test patch:
diff --git a/tests/core/pyspec/eth2spec/VERSION.txt b/tests/core/pyspec/eth2spec/VERSION.txt
--- a/tests/core/pyspec/eth2spec/VERSION.txt
+++ b/tests/core/pyspec/eth2spec/VERSION.txt
@@ -1 +1 @@
-0.11.2
\ No newline at end of file
+0.12.0
\ No newline at end of file
diff --git a/tests/core/pyspec/eth2spec/config/config_util.py b/tests/core/pyspec/eth2spec/config/config_util.py
--- a/tests/core/pyspec/eth2spec/config/config_util.py
+++ b/tests/core/pyspec/eth2spec/config/config_util.py
@@ -24,12 +24,12 @@ def apply_constants_config(spec_globals: Dict[str, Any], warn_if_unknown: bool =
 
 # Load presets from a file, and then prepares the global config setting. This does not apply the config.
 # To apply the config, reload the spec module (it will re-initialize with the config taken from here).
-def prepare_config(configs_path, config_name):
+def prepare_config(configs_path: str, config_name: str) -> None:
     global config
     config = load_config_file(configs_path, config_name)
 
 
-def load_config_file(configs_dir, presets_name) -> Dict[str, Any]:
+def load_config_file(configs_dir: str, presets_name: str) -> Dict[str, Any]:
     """
     Loads the given preset
     :param presets_name: The name of the presets. (lowercase snake_case)
@@ -38,7 +38,7 @@ def load_config_file(configs_dir, presets_name) -> Dict[str, Any]:
     path = Path(join(configs_dir, presets_name + '.yaml'))
     yaml = YAML(typ='base')
     loaded = yaml.load(path)
-    out = dict()
+    out: Dict[str, Any] = dict()
     for k, v in loaded.items():
         if isinstance(v, list):
             # Clean up integer values. YAML parser renders lists of ints as list of str
diff --git a/tests/core/pyspec/eth2spec/test/context.py b/tests/core/pyspec/eth2spec/test/context.py
--- a/tests/core/pyspec/eth2spec/test/context.py
+++ b/tests/core/pyspec/eth2spec/test/context.py
@@ -9,6 +9,8 @@
 from random import Random
 from typing import Any, Callable, NewType, Sequence, TypedDict, Protocol
 
+from lru import LRU
+
 from importlib import reload
 
 
@@ -48,28 +50,46 @@ class SpecForks(TypedDict, total=False):
     PHASE1: SpecPhase1
 
 
+def _prepare_state(balances_fn: Callable[[Any], Sequence[int]], threshold_fn: Callable[[Any], int],
+                   spec: Spec, phases: SpecForks):
+
+    p0 = phases[PHASE0]
+    balances = balances_fn(p0)
+    activation_threshold = threshold_fn(p0)
+
+    state = create_genesis_state(spec=p0, validator_balances=balances,
+                                 activation_threshold=activation_threshold)
+    if spec.fork == PHASE1:
+        # TODO: instead of upgrading a test phase0 genesis state we can also write a phase1 state helper.
+        # Decide based on performance/consistency results later.
+        state = phases[PHASE1].upgrade_to_phase1(state)
+        # Shard state slot must lag behind BeaconState slot by at least 1
+        # Will handle this more elegantly with fork mechanics
+        spec.process_slots(state, state.slot + 1)
+
+    return state
+
+
+_custom_state_cache_dict = LRU(size=10)
+
+
 def with_custom_state(balances_fn: Callable[[Any], Sequence[int]],
                       threshold_fn: Callable[[Any], int]):
     def deco(fn):
+
         def entry(*args, spec: Spec, phases: SpecForks, **kw):
-            try:
-                p0 = phases[PHASE0]
-                balances = balances_fn(p0)
-                activation_threshold = threshold_fn(p0)
-
-                state = create_genesis_state(spec=p0, validator_balances=balances,
-                                             activation_threshold=activation_threshold)
-                if spec.fork == PHASE1:
-                    # TODO: instead of upgrading a test phase0 genesis state we can also write a phase1 state helper.
-                    # Decide based on performance/consistency results later.
-                    state = phases[PHASE1].upgrade_to_phase1(state)
-                    # Shard state slot must lag behind BeaconState slot by at least 1
-                    # Will handle this more elegantly with fork mechanics
-                    spec.process_slots(state, state.slot + 1)
-
-                kw['state'] = state
-            except KeyError:
-                raise TypeError('Spec decorator must come within state decorator to inject spec into state.')
+            # make a key for the state
+            # genesis fork version separates configs during test-generation runtime.
+            key = (spec.fork, spec.GENESIS_FORK_VERSION, spec.__file__, balances_fn, threshold_fn)
+            global _custom_state_cache_dict
+            if key not in _custom_state_cache_dict:
+                state = _prepare_state(balances_fn, threshold_fn, spec, phases)
+                _custom_state_cache_dict[key] = state.get_backing()
+
+            # Take an entry out of the LRU.
+            # No copy is necessary, as we wrap the immutable backing with a new view.
+            state = spec.BeaconState(backing=_custom_state_cache_dict[key])
+            kw['state'] = state
             return fn(*args, spec=spec, phases=phases, **kw)
         return entry
     return deco
diff --git a/tests/core/pyspec/eth2spec/test/fork_choice/test_on_attestation.py b/tests/core/pyspec/eth2spec/test/fork_choice/test_on_attestation.py
--- a/tests/core/pyspec/eth2spec/test/fork_choice/test_on_attestation.py
+++ b/tests/core/pyspec/eth2spec/test/fork_choice/test_on_attestation.py
@@ -1,7 +1,7 @@
 from eth2spec.test.context import PHASE0, with_all_phases, spec_state_test
 from eth2spec.test.helpers.block import build_empty_block_for_next_slot
 from eth2spec.test.helpers.attestations import get_valid_attestation, sign_attestation
-from eth2spec.test.helpers.state import transition_to, state_transition_and_sign_block, next_epoch
+from eth2spec.test.helpers.state import transition_to, state_transition_and_sign_block, next_epoch, next_slot
 
 
 def run_on_attestation(spec, state, store, attestation, valid=True):
@@ -116,6 +116,44 @@ def test_on_attestation_mismatched_target_and_slot(spec, state):
     run_on_attestation(spec, state, store, attestation, False)
 
 
+@with_all_phases
+@spec_state_test
+def test_on_attestation_inconsistent_target_and_head(spec, state):
+    store = spec.get_forkchoice_store(state)
+    spec.on_tick(store, store.time + 2 * spec.SECONDS_PER_SLOT * spec.SLOTS_PER_EPOCH)
+
+    # Create chain 1 as empty chain between genesis and start of 1st epoch
+    target_state_1 = state.copy()
+    next_epoch(spec, target_state_1)
+
+    # Create chain 2 with different block in chain from chain 1 from chain 1 from chain 1 from chain 1
+    target_state_2 = state.copy()
+    diff_block = build_empty_block_for_next_slot(spec, target_state_2)
+    signed_diff_block = state_transition_and_sign_block(spec, target_state_2, diff_block)
+    spec.on_block(store, signed_diff_block)
+    next_epoch(spec, target_state_2)
+    next_slot(spec, target_state_2)
+
+    # Create and store block new head block on target state 1
+    head_block = build_empty_block_for_next_slot(spec, target_state_1)
+    signed_head_block = state_transition_and_sign_block(spec, target_state_1, head_block)
+    spec.on_block(store, signed_head_block)
+
+    # Attest to head of chain 1
+    attestation = get_valid_attestation(spec, target_state_1, slot=head_block.slot, signed=False)
+    epoch = spec.compute_epoch_at_slot(attestation.data.slot)
+
+    # Set attestation target to be from chain 2
+    attestation.data.target = spec.Checkpoint(epoch=epoch, root=spec.get_block_root(target_state_2, epoch))
+    sign_attestation(spec, state, attestation)
+
+    assert attestation.data.target.epoch == spec.GENESIS_EPOCH + 1
+    assert spec.compute_epoch_at_slot(attestation.data.slot) == spec.GENESIS_EPOCH + 1
+    assert spec.get_block_root(target_state_1, epoch) != attestation.data.target.root
+
+    run_on_attestation(spec, state, store, attestation, False)
+
+
 @with_all_phases
 @spec_state_test
 def test_on_attestation_target_not_in_store(spec, state):
diff --git a/tests/core/pyspec/eth2spec/test/fork_choice/test_on_block.py b/tests/core/pyspec/eth2spec/test/fork_choice/test_on_block.py
--- a/tests/core/pyspec/eth2spec/test/fork_choice/test_on_block.py
+++ b/tests/core/pyspec/eth2spec/test/fork_choice/test_on_block.py
@@ -184,7 +184,7 @@ def test_on_block_finalized_skip_slots_not_in_skip_chain(spec, state):
 def test_on_block_update_justified_checkpoint_within_safe_slots(spec, state):
     # Initialization
     store = spec.get_forkchoice_store(state)
-    time = 100
+    time = 0
     spec.on_tick(store, time)
 
     next_epoch(spec, state)
@@ -215,7 +215,7 @@ def test_on_block_update_justified_checkpoint_within_safe_slots(spec, state):
 def test_on_block_outside_safe_slots_and_multiple_better_justified(spec, state):
     # Initialization
     store = spec.get_forkchoice_store(state)
-    time = 100
+    time = 0
     spec.on_tick(store, time)
 
     next_epoch(spec, state)
diff --git a/tests/core/pyspec/eth2spec/test/helpers/attestations.py b/tests/core/pyspec/eth2spec/test/helpers/attestations.py
--- a/tests/core/pyspec/eth2spec/test/helpers/attestations.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/attestations.py
@@ -6,6 +6,7 @@
 from eth2spec.test.helpers.keys import privkeys
 from eth2spec.utils import bls
 from eth2spec.utils.ssz.ssz_typing import Bitlist
+from lru import LRU
 
 
 def run_attestation_processing(spec, state, attestation, valid=True):
@@ -148,10 +149,12 @@ def get_valid_attestation(spec,
                           state,
                           slot=None,
                           index=None,
+                          filter_participant_set=None,
                           shard_transition=None,
-                          empty=False,
                           signed=False,
                           on_time=True):
+    # If filter_participant_set filters everything, the attestation has 0 participants, and cannot be signed.
+    # Thus strictly speaking invalid when no participant is added later.
     if slot is None:
         slot = state.slot
     if index is None:
@@ -173,10 +176,8 @@ def get_valid_attestation(spec,
         aggregation_bits=aggregation_bits,
         data=attestation_data,
     )
-    if not empty:
-        fill_aggregate_attestation(spec, state, attestation)
-    if signed:
-        sign_attestation(spec, state, attestation)
+    # fill the attestation with (optionally filtered) participants, and optionally sign it
+    fill_aggregate_attestation(spec, state, attestation, signed=signed, filter_participant_set=filter_participant_set)
 
     if spec.fork == PHASE1 and on_time:
         attestation = convert_to_valid_on_time_attestation(spec, state, attestation, signed)
@@ -269,16 +270,25 @@ def get_attestation_signature(spec, state, attestation_data, privkey):
     return bls.Sign(privkey, signing_root)
 
 
-def fill_aggregate_attestation(spec, state, attestation, signed=False):
+def fill_aggregate_attestation(spec, state, attestation, signed=False, filter_participant_set=None):
+    """
+     `signed`: Signing is optional.
+     `filter_participant_set`: Optional, filters the full committee indices set (default) to a subset that participates
+    """
     beacon_committee = spec.get_beacon_committee(
         state,
         attestation.data.slot,
         attestation.data.index,
     )
+    # By default, have everyone participate
+    participants = set(beacon_committee)
+    # But optionally filter the participants to a smaller amount
+    if filter_participant_set is not None:
+        participants = filter_participant_set(participants)
     for i in range(len(beacon_committee)):
-        attestation.aggregation_bits[i] = True
+        attestation.aggregation_bits[i] = beacon_committee[i] in participants
 
-    if signed:
+    if signed and len(participants) > 0:
         sign_attestation(spec, state, attestation)
 
 
@@ -324,10 +334,12 @@ def next_epoch_with_attestations(spec,
     return state, signed_blocks, post_state
 
 
-def prepare_state_with_full_attestations(spec, state, empty=False):
+def prepare_state_with_attestations(spec, state, participation_fn=None):
     """
-    Fill ``state`` with maximally full attestations.
-    Move to the start of the next epoch to ensure full epoch worth.
+    Prepare state with attestations according to the ``participation_fn``.
+    If no ``participation_fn``, default to "full" -- max committee participation at each slot.
+
+    participation_fn: (slot, committee_index, committee_indices_set) -> participants_indices_set
     """
     # Go to start of next epoch to ensure can have full participation
     next_epoch(spec, state)
@@ -340,8 +352,15 @@ def prepare_state_with_full_attestations(spec, state, empty=False):
         # create an attestation for each index in each slot in epoch
         if state.slot < next_epoch_start_slot:
             for committee_index in range(spec.get_committee_count_at_slot(state, state.slot)):
-                attestation = get_valid_attestation(spec, state, index=committee_index, empty=empty, signed=True)
-                attestations.append(attestation)
+                def temp_participants_filter(comm):
+                    if participation_fn is None:
+                        return comm
+                    else:
+                        return participation_fn(state.slot, committee_index, comm)
+                attestation = get_valid_attestation(spec, state, index=committee_index,
+                                                    filter_participant_set=temp_participants_filter, signed=True)
+                if any(attestation.aggregation_bits):  # Only if there is at least 1 participant.
+                    attestations.append(attestation)
         # fill each created slot in state after inclusion delay
         if state.slot >= start_slot + spec.MIN_ATTESTATION_INCLUSION_DELAY:
             inclusion_slot = state.slot - spec.MIN_ATTESTATION_INCLUSION_DELAY
@@ -355,6 +374,27 @@ def prepare_state_with_full_attestations(spec, state, empty=False):
     return attestations
 
 
+_prep_state_cache_dict = LRU(size=10)
+
+
+def cached_prepare_state_with_attestations(spec, state):
+    """
+    Cached version of prepare_state_with_attestations,
+    but does not return anything, and does not support a participation fn argument
+    """
+    # If the pre-state is not already known in the LRU, then take it,
+    # prepare it with attestations, and put it in the LRU.
+    # The input state is likely already cached, so the hash-tree-root does not affect speed.
+    key = (spec.fork, state.hash_tree_root())
+    global _prep_state_cache_dict
+    if key not in _prep_state_cache_dict:
+        prepare_state_with_attestations(spec, state)
+        _prep_state_cache_dict[key] = state.get_backing()  # cache the tree structure, not the view wrapping it.
+
+    # Put the LRU cache result into the state view, as if we transitioned the original view
+    state.set_backing(_prep_state_cache_dict[key])
+
+
 def fill_block_shard_transitions_by_attestations(spec, state, block):
     block.body.shard_transitions = [spec.ShardTransition()] * spec.MAX_SHARDS
     for attestation in block.body.attestations:
diff --git a/tests/core/pyspec/eth2spec/test/helpers/attester_slashings.py b/tests/core/pyspec/eth2spec/test/helpers/attester_slashings.py
--- a/tests/core/pyspec/eth2spec/test/helpers/attester_slashings.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/attester_slashings.py
@@ -1,5 +1,5 @@
 from eth2spec.test.context import PHASE1
-from eth2spec.test.helpers.attestations import get_valid_attestation, sign_attestation
+from eth2spec.test.helpers.attestations import get_valid_attestation, sign_attestation, sign_indexed_attestation
 
 
 def get_valid_attester_slashing(spec, state, signed_1=False, signed_2=False):
@@ -17,6 +17,26 @@ def get_valid_attester_slashing(spec, state, signed_1=False, signed_2=False):
     )
 
 
+def get_valid_attester_slashing_by_indices(spec, state, indices_1, indices_2=None, signed_1=False, signed_2=False):
+    if indices_2 is None:
+        indices_2 = indices_1
+
+    assert indices_1 == sorted(indices_1)
+    assert indices_2 == sorted(indices_2)
+
+    attester_slashing = get_valid_attester_slashing(spec, state)
+
+    attester_slashing.attestation_1.attesting_indices = indices_1
+    attester_slashing.attestation_2.attesting_indices = indices_2
+
+    if signed_1:
+        sign_indexed_attestation(spec, state, attester_slashing.attestation_1)
+    if signed_2:
+        sign_indexed_attestation(spec, state, attester_slashing.attestation_2)
+
+    return attester_slashing
+
+
 def get_indexed_attestation_participants(spec, indexed_att):
     """
     Wrapper around index-attestation to return the list of participant indices, regardless of spec phase.
diff --git a/tests/core/pyspec/eth2spec/test/helpers/deposits.py b/tests/core/pyspec/eth2spec/test/helpers/deposits.py
--- a/tests/core/pyspec/eth2spec/test/helpers/deposits.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/deposits.py
@@ -5,6 +5,17 @@
 from eth2spec.utils.ssz.ssz_typing import List
 
 
+def mock_deposit(spec, state, index):
+    """
+    Mock validator at ``index`` as having just made a deposit
+    """
+    assert spec.is_active_validator(state.validators[index], spec.get_current_epoch(state))
+    state.validators[index].activation_eligibility_epoch = spec.FAR_FUTURE_EPOCH
+    state.validators[index].activation_epoch = spec.FAR_FUTURE_EPOCH
+    state.validators[index].effective_balance = spec.MAX_EFFECTIVE_BALANCE
+    assert not spec.is_active_validator(state.validators[index], spec.get_current_epoch(state))
+
+
 def build_deposit_data(spec, pubkey, privkey, amount, withdrawal_credentials, signed=False):
     deposit_data = spec.DepositData(
         pubkey=pubkey,
diff --git a/tests/core/pyspec/eth2spec/test/helpers/keys.py b/tests/core/pyspec/eth2spec/test/helpers/keys.py
--- a/tests/core/pyspec/eth2spec/test/helpers/keys.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/keys.py
@@ -2,5 +2,5 @@
 from eth2spec.phase0 import spec
 
 privkeys = [i + 1 for i in range(spec.SLOTS_PER_EPOCH * 256)]
-pubkeys = [bls.PrivToPub(privkey) for privkey in privkeys]
+pubkeys = [bls.SkToPk(privkey) for privkey in privkeys]
 pubkey_to_privkey = {pubkey: privkey for privkey, pubkey in zip(privkeys, pubkeys)}
diff --git a/tests/core/pyspec/eth2spec/test/helpers/rewards.py b/tests/core/pyspec/eth2spec/test/helpers/rewards.py
--- a/tests/core/pyspec/eth2spec/test/helpers/rewards.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/rewards.py
@@ -1,7 +1,8 @@
 from random import Random
 
 from eth2spec.phase0 import spec as spec_phase0
-from eth2spec.test.helpers.attestations import prepare_state_with_full_attestations
+from eth2spec.test.helpers.attestations import cached_prepare_state_with_attestations
+from eth2spec.test.helpers.deposits import mock_deposit
 from eth2spec.test.helpers.state import next_epoch
 from eth2spec.utils.ssz.ssz_typing import Container, uint64, List
 
@@ -24,17 +25,50 @@ def has_enough_for_reward(spec, state, index):
     )
 
 
-def run_attestation_component_deltas(spec, state, component_delta_fn, matching_att_fn):
+def run_deltas(spec, state):
     """
-    Run ``component_delta_fn``, yielding:
+    Run all deltas functions yielding:
       - pre-state ('pre')
-      - deltas ('deltas')
+      - source deltas ('source_deltas')
+      - target deltas ('target_deltas')
+      - head deltas ('head_deltas')
+      - inclusion delay deltas ('inclusion_delay_deltas')
+      - inactivity penalty deltas ('inactivity_penalty_deltas')
     """
     yield 'pre', state
+    yield from run_attestation_component_deltas(
+        spec,
+        state,
+        spec.get_source_deltas,
+        spec.get_matching_source_attestations,
+        'source_deltas',
+    )
+    yield from run_attestation_component_deltas(
+        spec,
+        state,
+        spec.get_target_deltas,
+        spec.get_matching_target_attestations,
+        'target_deltas',
+    )
+    yield from run_attestation_component_deltas(
+        spec,
+        state,
+        spec.get_head_deltas,
+        spec.get_matching_head_attestations,
+        'head_deltas',
+    )
+    yield from run_get_inclusion_delay_deltas(spec, state)
+    yield from run_get_inactivity_penalty_deltas(spec, state)
+
 
+def run_attestation_component_deltas(spec, state, component_delta_fn, matching_att_fn, deltas_name):
+    """
+    Run ``component_delta_fn``, yielding:
+      - deltas ('{``deltas_name``}')
+    """
     rewards, penalties = component_delta_fn(state)
 
-    yield 'deltas', Deltas(rewards=rewards, penalties=penalties)
+    yield deltas_name, Deltas(rewards=rewards, penalties=penalties)
 
     matching_attestations = matching_att_fn(state, spec.get_previous_epoch(state))
     matching_indices = spec.get_unslashed_attesting_indices(state, matching_attestations)
@@ -61,6 +95,95 @@ def run_attestation_component_deltas(spec, state, component_delta_fn, matching_a
                 assert penalties[index] == 0
 
 
+def run_get_inclusion_delay_deltas(spec, state):
+    """
+    Run ``get_inclusion_delay_deltas``, yielding:
+      - inclusion delay deltas ('inclusion_delay_deltas')
+    """
+    rewards, penalties = spec.get_inclusion_delay_deltas(state)
+
+    yield 'inclusion_delay_deltas', Deltas(rewards=rewards, penalties=penalties)
+
+    eligible_attestations = spec.get_matching_source_attestations(state, spec.get_previous_epoch(state))
+    attesting_indices = spec.get_unslashed_attesting_indices(state, eligible_attestations)
+
+    rewarded_indices = set()
+    rewarded_proposer_indices = set()
+    # Ensure attesters with enough balance are rewarded for attestations
+    # Track those that are rewarded and track proposers that should be rewarded
+    for index in range(len(state.validators)):
+        if index in attesting_indices and has_enough_for_reward(spec, state, index):
+            assert rewards[index] > 0
+            rewarded_indices.add(index)
+
+            # Track proposer of earliest included attestation for the validator defined by index
+            earliest_attestation = min([
+                a for a in eligible_attestations
+                if index in spec.get_attesting_indices(state, a.data, a.aggregation_bits)
+            ], key=lambda a: a.inclusion_delay)
+            rewarded_proposer_indices.add(earliest_attestation.proposer_index)
+
+    # Ensure all expected proposers have been rewarded
+    # Track rewarde indices
+    proposing_indices = [a.proposer_index for a in eligible_attestations]
+    for index in proposing_indices:
+        if index in rewarded_proposer_indices:
+            assert rewards[index] > 0
+            rewarded_indices.add(index)
+
+    # Ensure all expected non-rewarded indices received no reward
+    for index in range(len(state.validators)):
+        assert penalties[index] == 0
+        if index not in rewarded_indices:
+            assert rewards[index] == 0
+
+
+def run_get_inactivity_penalty_deltas(spec, state):
+    """
+    Run ``get_inactivity_penalty_deltas``, yielding:
+      - inactivity penalty deltas ('inactivity_penalty_deltas')
+    """
+    rewards, penalties = spec.get_inactivity_penalty_deltas(state)
+
+    yield 'inactivity_penalty_deltas', Deltas(rewards=rewards, penalties=penalties)
+
+    matching_attestations = spec.get_matching_target_attestations(state, spec.get_previous_epoch(state))
+    matching_attesting_indices = spec.get_unslashed_attesting_indices(state, matching_attestations)
+
+    finality_delay = spec.get_previous_epoch(state) - state.finalized_checkpoint.epoch
+    eligible_indices = spec.get_eligible_validator_indices(state)
+    for index in range(len(state.validators)):
+        assert rewards[index] == 0
+        if index not in eligible_indices:
+            assert penalties[index] == 0
+            continue
+
+        if finality_delay > spec.MIN_EPOCHS_TO_INACTIVITY_PENALTY:
+            base_penalty = spec.BASE_REWARDS_PER_EPOCH * spec.get_base_reward(state, index)
+            if not has_enough_for_reward(spec, state, index):
+                assert penalties[index] == 0
+            elif index in matching_attesting_indices:
+                assert penalties[index] == base_penalty
+            else:
+                assert penalties[index] > base_penalty
+        else:
+            assert penalties[index] == 0
+
+
+def set_some_new_deposits(spec, state, rng):
+    num_validators = len(state.validators)
+    # Set ~1/10 to just recently deposited
+    for index in range(num_validators):
+        # If not already active, skip
+        if not spec.is_active_validator(state.validators[index], spec.get_current_epoch(state)):
+            continue
+        if rng.randrange(num_validators) < num_validators // 10:
+            mock_deposit(spec, state, index)
+            # Set ~half of selected to eligible for activation
+            if rng.choice([True, False]):
+                state.validators[index].activation_eligibility_epoch = spec.get_current_epoch(state)
+
+
 def exit_random_validators(spec, state, rng):
     if spec.get_current_epoch(state) < 5:
         # Move epochs forward to allow for some validators already exited/withdrawable
@@ -69,10 +192,11 @@ def exit_random_validators(spec, state, rng):
 
     current_epoch = spec.get_current_epoch(state)
     # Exit ~1/2 of validators
-    for validator in state.validators:
+    for index in spec.get_active_validator_indices(state, current_epoch):
         if rng.choice([True, False]):
             continue
 
+        validator = state.validators[index]
         validator.exit_epoch = rng.choice([current_epoch - 1, current_epoch - 2, current_epoch - 3])
         # ~1/2 are withdrawable
         if rng.choice([True, False]):
@@ -83,84 +207,92 @@ def exit_random_validators(spec, state, rng):
 
 def slash_random_validators(spec, state, rng):
     # Slash ~1/2 of validators
-    for validator in state.validators:
-        validator.slashed = rng.choice([True, False])
+    for index in range(len(state.validators)):
+        # slash at least one validator
+        if index == 0 or rng.choice([True, False]):
+            spec.slash_validator(state, index)
 
 
-def run_test_empty(spec, state, runner):
+def run_test_empty(spec, state):
     # Do not add any attestations to state
 
-    yield from runner(spec, state)
+    yield from run_deltas(spec, state)
 
 
-def run_test_full_all_correct(spec, state, runner):
-    prepare_state_with_full_attestations(spec, state)
+def run_test_full_all_correct(spec, state):
+    cached_prepare_state_with_attestations(spec, state)
 
-    yield from runner(spec, state)
+    yield from run_deltas(spec, state)
 
 
-def run_test_full_but_partial_participation(spec, state, runner, rng=Random(5522)):
-    prepare_state_with_full_attestations(spec, state)
+def run_test_full_but_partial_participation(spec, state, rng=Random(5522)):
+    cached_prepare_state_with_attestations(spec, state)
 
     for a in state.previous_epoch_attestations:
         a.aggregation_bits = [rng.choice([True, False]) for _ in a.aggregation_bits]
 
-    yield from runner(spec, state)
+    yield from run_deltas(spec, state)
 
 
-def run_test_partial(spec, state, fraction_filled, runner):
-    prepare_state_with_full_attestations(spec, state)
+def run_test_partial(spec, state, fraction_filled):
+    cached_prepare_state_with_attestations(spec, state)
 
     # Remove portion of attestations
     num_attestations = int(len(state.previous_epoch_attestations) * fraction_filled)
     state.previous_epoch_attestations = state.previous_epoch_attestations[:num_attestations]
 
-    yield from runner(spec, state)
+    yield from run_deltas(spec, state)
 
 
-def run_test_half_full(spec, state, runner):
-    yield from run_test_partial(spec, state, 0.5, runner)
+def run_test_half_full(spec, state):
+    yield from run_test_partial(spec, state, 0.5)
 
 
-def run_test_one_attestation_one_correct(spec, state, runner):
-    prepare_state_with_full_attestations(spec, state)
+def run_test_one_attestation_one_correct(spec, state):
+    cached_prepare_state_with_attestations(spec, state)
 
     # Remove all attestations except for the first one
     state.previous_epoch_attestations = state.previous_epoch_attestations[:1]
 
-    yield from runner(spec, state)
+    yield from run_deltas(spec, state)
+
+
+def run_test_with_not_yet_activated_validators(spec, state, rng=Random(5555)):
+    set_some_new_deposits(spec, state, rng)
+    cached_prepare_state_with_attestations(spec, state)
 
+    yield from run_deltas(spec, state)
 
-def run_test_with_exited_validators(spec, state, runner, rng=Random(1337)):
+
+def run_test_with_exited_validators(spec, state, rng=Random(1337)):
     exit_random_validators(spec, state, rng)
-    prepare_state_with_full_attestations(spec, state)
+    cached_prepare_state_with_attestations(spec, state)
 
-    yield from runner(spec, state)
+    yield from run_deltas(spec, state)
 
 
-def run_test_with_slashed_validators(spec, state, runner, rng=Random(3322)):
+def run_test_with_slashed_validators(spec, state, rng=Random(3322)):
     exit_random_validators(spec, state, rng)
     slash_random_validators(spec, state, rng)
 
-    prepare_state_with_full_attestations(spec, state)
+    cached_prepare_state_with_attestations(spec, state)
 
-    yield from runner(spec, state)
+    yield from run_deltas(spec, state)
 
 
-def run_test_some_very_low_effective_balances_that_attested(spec, state, runner):
-    state.balances
-    prepare_state_with_full_attestations(spec, state)
+def run_test_some_very_low_effective_balances_that_attested(spec, state):
+    cached_prepare_state_with_attestations(spec, state)
 
     # Set some balances to be very low (including 0)
     assert len(state.validators) >= 5
     for i, index in enumerate(range(5)):
         state.validators[index].effective_balance = i
 
-    yield from runner(spec, state)
+    yield from run_deltas(spec, state)
 
 
-def run_test_some_very_low_effective_balances_that_did_not_attest(spec, state, runner):
-    prepare_state_with_full_attestations(spec, state)
+def run_test_some_very_low_effective_balances_that_did_not_attest(spec, state):
+    cached_prepare_state_with_attestations(spec, state)
 
     # Remove attestation
     attestation = state.previous_epoch_attestations[0]
@@ -170,11 +302,11 @@ def run_test_some_very_low_effective_balances_that_did_not_attest(spec, state, r
     for i, index in enumerate(indices):
         state.validators[index].effective_balance = i
 
-    yield from runner(spec, state)
+    yield from run_deltas(spec, state)
 
 
-def run_test_full_fraction_incorrect(spec, state, correct_target, correct_head, fraction_incorrect, runner):
-    prepare_state_with_full_attestations(spec, state)
+def run_test_full_fraction_incorrect(spec, state, correct_target, correct_head, fraction_incorrect):
+    cached_prepare_state_with_attestations(spec, state)
 
     # Make fraction_incorrect of pending attestations have bad target/head as specified
     num_incorrect = int(fraction_incorrect * len(state.previous_epoch_attestations))
@@ -184,14 +316,97 @@ def run_test_full_fraction_incorrect(spec, state, correct_target, correct_head,
         if not correct_head:
             pending_attestation.data.beacon_block_root = b'\x66' * 32
 
-    yield from runner(spec, state)
+    yield from run_deltas(spec, state)
+
+
+def run_test_full_delay_one_slot(spec, state):
+    cached_prepare_state_with_attestations(spec, state)
+    for a in state.previous_epoch_attestations:
+        a.inclusion_delay += 1
+
+    yield from run_deltas(spec, state)
+
+
+def run_test_full_delay_max_slots(spec, state):
+    cached_prepare_state_with_attestations(spec, state)
+    for a in state.previous_epoch_attestations:
+        a.inclusion_delay += spec.SLOTS_PER_EPOCH
+
+    yield from run_deltas(spec, state)
+
+
+def run_test_full_mixed_delay(spec, state, rng=Random(1234)):
+    cached_prepare_state_with_attestations(spec, state)
+    for a in state.previous_epoch_attestations:
+        a.inclusion_delay = rng.randint(1, spec.SLOTS_PER_EPOCH)
+
+    yield from run_deltas(spec, state)
+
+
+def run_test_proposer_not_in_attestations(spec, state):
+    cached_prepare_state_with_attestations(spec, state)
+
+    # Get an attestation where the proposer is not in the committee
+    non_proposer_attestations = []
+    for a in state.previous_epoch_attestations:
+        if a.proposer_index not in spec.get_unslashed_attesting_indices(state, [a]):
+            non_proposer_attestations.append(a)
+
+    assert any(non_proposer_attestations)
+    state.previous_epoch_attestations = non_proposer_attestations
+
+    yield from run_deltas(spec, state)
+
+
+def run_test_duplicate_attestations_at_later_slots(spec, state):
+    cached_prepare_state_with_attestations(spec, state)
+
+    # Remove 2/3 of attestations to make it more interesting
+    num_attestations = int(len(state.previous_epoch_attestations) * 0.33)
+    state.previous_epoch_attestations = state.previous_epoch_attestations[:num_attestations]
+
+    # Get map of the proposer at each slot to make valid-looking duplicate attestations
+    per_slot_proposers = {
+        (a.data.slot + a.inclusion_delay): a.proposer_index
+        for a in state.previous_epoch_attestations
+    }
+    max_slot = max([a.data.slot + a.inclusion_delay for a in state.previous_epoch_attestations])
+    later_attestations = []
+    for a in state.previous_epoch_attestations:
+        # Only have proposers for previous epoch so do not create later
+        # duplicate if slot exceeds the max slot in previous_epoch_attestations
+        if a.data.slot + a.inclusion_delay >= max_slot:
+            continue
+        later_a = a.copy()
+        later_a.inclusion_delay += 1
+        later_a.proposer_index = per_slot_proposers[later_a.data.slot + later_a.inclusion_delay]
+        later_attestations.append(later_a)
+
+    assert any(later_attestations)
+
+    state.previous_epoch_attestations = sorted(
+        state.previous_epoch_attestations + later_attestations,
+        key=lambda a: a.data.slot + a.inclusion_delay
+    )
+
+    yield from run_deltas(spec, state)
+
+
+def run_test_all_balances_too_low_for_reward(spec, state):
+    cached_prepare_state_with_attestations(spec, state)
+
+    for index in range(len(state.validators)):
+        state.validators[index].effective_balance = 10
+
+    yield from run_deltas(spec, state)
 
 
-def run_test_full_random(spec, state, runner, rng=Random(8020)):
+def run_test_full_random(spec, state, rng=Random(8020)):
+    set_some_new_deposits(spec, state, rng)
     exit_random_validators(spec, state, rng)
     slash_random_validators(spec, state, rng)
 
-    prepare_state_with_full_attestations(spec, state)
+    cached_prepare_state_with_attestations(spec, state)
 
     for pending_attestation in state.previous_epoch_attestations:
         # ~1/3 have bad target
@@ -205,4 +420,4 @@ def run_test_full_random(spec, state, runner, rng=Random(8020)):
         # Random inclusion delay
         pending_attestation.inclusion_delay = rng.randint(1, spec.SLOTS_PER_EPOCH)
 
-    yield from runner(spec, state)
+    yield from run_deltas(spec, state)
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_attestation.py b/tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_attestation.py
--- a/tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_attestation.py
+++ b/tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_attestation.py
@@ -13,7 +13,6 @@
     sign_attestation,
 )
 from eth2spec.test.helpers.state import (
-    next_slot,
     next_slots,
     next_epoch_via_block,
     transition_to_slot_via_block,
@@ -61,6 +60,29 @@ def test_invalid_attestation_signature(spec, state):
     yield from run_attestation_processing(spec, state, attestation, False)
 
 
+@with_all_phases
+@spec_state_test
+@always_bls
+def test_empty_participants_zeroes_sig(spec, state):
+    attestation = get_valid_attestation(spec, state, filter_participant_set=lambda comm: [])  # 0 participants
+    attestation.signature = spec.BLSSignature(b'\x00' * 96)
+    next_slots(spec, state, spec.MIN_ATTESTATION_INCLUSION_DELAY)
+
+    yield from run_attestation_processing(spec, state, attestation, False)
+
+
+@with_all_phases
+@spec_state_test
+@always_bls
+def test_empty_participants_seemingly_valid_sig(spec, state):
+    attestation = get_valid_attestation(spec, state, filter_participant_set=lambda comm: [])  # 0 participants
+    # Special BLS value, valid for zero pubkeys on some (but not all) BLS implementations.
+    attestation.signature = spec.BLSSignature(b'\xc0' + b'\x00' * 95)
+    next_slots(spec, state, spec.MIN_ATTESTATION_INCLUSION_DELAY)
+
+    yield from run_attestation_processing(spec, state, attestation, False)
+
+
 @with_all_phases
 @spec_state_test
 def test_before_inclusion_delay(spec, state):
@@ -256,19 +278,6 @@ def test_bad_source_root(spec, state):
     yield from run_attestation_processing(spec, state, attestation, False)
 
 
-@with_all_phases
-@spec_state_test
-def test_empty_aggregation_bits(spec, state):
-    next_slot(spec, state)
-    attestation = get_valid_attestation(spec, state, empty=True)
-    next_slots(spec, state, spec.MIN_ATTESTATION_INCLUSION_DELAY)
-
-    assert attestation.aggregation_bits == Bitlist[spec.MAX_VALIDATORS_PER_COMMITTEE](
-        *([0b0] * len(attestation.aggregation_bits)))
-
-    yield from run_attestation_processing(spec, state, attestation)
-
-
 @with_all_phases
 @spec_state_test
 def test_too_many_aggregation_bits(spec, state):
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_voluntary_exit.py b/tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_voluntary_exit.py
--- a/tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_voluntary_exit.py
+++ b/tests/core/pyspec/eth2spec/test/phase_0/block_processing/test_process_voluntary_exit.py
@@ -34,8 +34,8 @@ def run_voluntary_exit_processing(spec, state, signed_voluntary_exit, valid=True
 @with_all_phases
 @spec_state_test
 def test_success(spec, state):
-    # move state forward PERSISTENT_COMMITTEE_PERIOD epochs to allow for exit
-    state.slot += spec.PERSISTENT_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH
+    # move state forward SHARD_COMMITTEE_PERIOD epochs to allow for exit
+    state.slot += spec.SHARD_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH
 
     current_epoch = spec.get_current_epoch(state)
     validator_index = spec.get_active_validator_indices(state, current_epoch)[0]
@@ -53,8 +53,8 @@ def test_success(spec, state):
 @spec_state_test
 @always_bls
 def test_invalid_signature(spec, state):
-    # move state forward PERSISTENT_COMMITTEE_PERIOD epochs to allow for exit
-    state.slot += spec.PERSISTENT_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH
+    # move state forward SHARD_COMMITTEE_PERIOD epochs to allow for exit
+    state.slot += spec.SHARD_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH
 
     current_epoch = spec.get_current_epoch(state)
     validator_index = spec.get_active_validator_indices(state, current_epoch)[0]
@@ -71,8 +71,8 @@ def test_invalid_signature(spec, state):
 @with_all_phases
 @spec_state_test
 def test_success_exit_queue(spec, state):
-    # move state forward PERSISTENT_COMMITTEE_PERIOD epochs to allow for exit
-    state.slot += spec.PERSISTENT_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH
+    # move state forward SHARD_COMMITTEE_PERIOD epochs to allow for exit
+    state.slot += spec.SHARD_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH
 
     current_epoch = spec.get_current_epoch(state)
 
@@ -115,8 +115,8 @@ def test_success_exit_queue(spec, state):
 @with_all_phases
 @spec_state_test
 def test_default_exit_epoch_subsequent_exit(spec, state):
-    # move state forward PERSISTENT_COMMITTEE_PERIOD epochs to allow for exit
-    state.slot += spec.PERSISTENT_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH
+    # move state forward SHARD_COMMITTEE_PERIOD epochs to allow for exit
+    state.slot += spec.SHARD_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH
 
     current_epoch = spec.get_current_epoch(state)
     validator_index = spec.get_active_validator_indices(state, current_epoch)[0]
@@ -137,8 +137,8 @@ def test_default_exit_epoch_subsequent_exit(spec, state):
 @with_all_phases
 @spec_state_test
 def test_validator_exit_in_future(spec, state):
-    # move state forward PERSISTENT_COMMITTEE_PERIOD epochs to allow for exit
-    state.slot += spec.PERSISTENT_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH
+    # move state forward SHARD_COMMITTEE_PERIOD epochs to allow for exit
+    state.slot += spec.SHARD_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH
 
     current_epoch = spec.get_current_epoch(state)
     validator_index = spec.get_active_validator_indices(state, current_epoch)[0]
@@ -156,8 +156,8 @@ def test_validator_exit_in_future(spec, state):
 @with_all_phases
 @spec_state_test
 def test_validator_invalid_validator_index(spec, state):
-    # move state forward PERSISTENT_COMMITTEE_PERIOD epochs to allow for exit
-    state.slot += spec.PERSISTENT_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH
+    # move state forward SHARD_COMMITTEE_PERIOD epochs to allow for exit
+    state.slot += spec.SHARD_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH
 
     current_epoch = spec.get_current_epoch(state)
     validator_index = spec.get_active_validator_indices(state, current_epoch)[0]
@@ -190,8 +190,8 @@ def test_validator_not_active(spec, state):
 @with_all_phases
 @spec_state_test
 def test_validator_already_exited(spec, state):
-    # move state forward PERSISTENT_COMMITTEE_PERIOD epochs to allow validator able to exit
-    state.slot += spec.PERSISTENT_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH
+    # move state forward SHARD_COMMITTEE_PERIOD epochs to allow validator able to exit
+    state.slot += spec.SHARD_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH
 
     current_epoch = spec.get_current_epoch(state)
     validator_index = spec.get_active_validator_indices(state, current_epoch)[0]
@@ -218,7 +218,7 @@ def test_validator_not_active_long_enough(spec, state):
 
     assert (
         current_epoch - state.validators[validator_index].activation_epoch <
-        spec.PERSISTENT_COMMITTEE_PERIOD
+        spec.SHARD_COMMITTEE_PERIOD
     )
 
     yield from run_voluntary_exit_processing(spec, state, signed_voluntary_exit, False)
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_registry_updates.py b/tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_registry_updates.py
--- a/tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_registry_updates.py
+++ b/tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_registry_updates.py
@@ -1,3 +1,4 @@
+from eth2spec.test.helpers.deposits import mock_deposit
 from eth2spec.test.helpers.state import next_epoch, next_slots
 from eth2spec.test.context import spec_state_test, with_all_phases
 from eth2spec.test.phase_0.epoch_processing.run_epoch_process_base import run_epoch_processing_with
@@ -7,14 +8,6 @@ def run_process_registry_updates(spec, state):
     yield from run_epoch_processing_with(spec, state, 'process_registry_updates')
 
 
-def mock_deposit(spec, state, index):
-    assert spec.is_active_validator(state.validators[index], spec.get_current_epoch(state))
-    state.validators[index].activation_eligibility_epoch = spec.FAR_FUTURE_EPOCH
-    state.validators[index].activation_epoch = spec.FAR_FUTURE_EPOCH
-    state.validators[index].effective_balance = spec.MAX_EFFECTIVE_BALANCE
-    assert not spec.is_active_validator(state.validators[index], spec.get_current_epoch(state))
-
-
 @with_all_phases
 @spec_state_test
 def test_add_to_activation_queue(spec, state):
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_rewards_and_penalties.py b/tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_rewards_and_penalties.py
--- a/tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_rewards_and_penalties.py
+++ b/tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_rewards_and_penalties.py
@@ -12,10 +12,11 @@
 from eth2spec.test.helpers.attestations import (
     add_attestations_to_state,
     get_valid_attestation,
-    prepare_state_with_full_attestations,
+    prepare_state_with_attestations,
 )
 from eth2spec.test.helpers.attester_slashings import get_indexed_attestation_participants
 from eth2spec.test.phase_0.epoch_processing.run_epoch_process_base import run_epoch_processing_with
+from random import Random
 
 
 def run_process_rewards_and_penalties(spec, state):
@@ -64,7 +65,7 @@ def test_genesis_epoch_full_attestations_no_rewards(spec, state):
 @with_all_phases
 @spec_state_test
 def test_full_attestations(spec, state):
-    attestations = prepare_state_with_full_attestations(spec, state)
+    attestations = prepare_state_with_attestations(spec, state)
 
     pre_state = state.copy()
 
@@ -82,7 +83,7 @@ def test_full_attestations(spec, state):
 @with_all_phases
 @spec_state_test
 def test_full_attestations_random_incorrect_fields(spec, state):
-    attestations = prepare_state_with_full_attestations(spec, state)
+    attestations = prepare_state_with_attestations(spec, state)
     for i, attestation in enumerate(state.previous_epoch_attestations):
         if i % 3 == 0:
             # Mess up some head votes
@@ -107,7 +108,7 @@ def test_full_attestations_random_incorrect_fields(spec, state):
 @with_custom_state(balances_fn=misc_balances, threshold_fn=lambda spec: spec.MAX_EFFECTIVE_BALANCE // 2)
 @single_phase
 def test_full_attestations_misc_balances(spec, state):
-    attestations = prepare_state_with_full_attestations(spec, state)
+    attestations = prepare_state_with_attestations(spec, state)
 
     pre_state = state.copy()
 
@@ -139,7 +140,7 @@ def test_full_attestations_misc_balances(spec, state):
 @with_custom_state(balances_fn=low_single_balance, threshold_fn=zero_activation_threshold)
 @single_phase
 def test_full_attestations_one_validaor_one_gwei(spec, state):
-    attestations = prepare_state_with_full_attestations(spec, state)
+    attestations = prepare_state_with_attestations(spec, state)
 
     yield from run_process_rewards_and_penalties(spec, state)
 
@@ -163,20 +164,55 @@ def test_no_attestations_all_penalties(spec, state):
         assert state.balances[index] < pre_state.balances[index]
 
 
-@with_all_phases
-@spec_state_test
-def test_empty_attestations(spec, state):
-    attestations = prepare_state_with_full_attestations(spec, state, empty=True)
+def run_with_participation(spec, state, participation_fn):
+    participated = set()
+
+    def participation_tracker(slot, comm_index, comm):
+        att_participants = participation_fn(slot, comm_index, comm)
+        participated.update(att_participants)
+        return att_participants
+
+    attestations = prepare_state_with_attestations(spec, state, participation_fn=participation_tracker)
 
     pre_state = state.copy()
 
     yield from run_process_rewards_and_penalties(spec, state)
 
     attesting_indices = spec.get_unslashed_attesting_indices(state, attestations)
-    assert len(attesting_indices) == 0
+    assert len(attesting_indices) == len(participated)
 
     for index in range(len(pre_state.validators)):
-        assert state.balances[index] < pre_state.balances[index]
+        if index in participated:
+            assert state.balances[index] > pre_state.balances[index]
+        else:
+            assert state.balances[index] < pre_state.balances[index]
+
+
+@with_all_phases
+@spec_state_test
+def test_almost_empty_attestations(spec, state):
+    rng = Random(1234)
+    yield from run_with_participation(spec, state, lambda slot, comm_index, comm: rng.sample(comm, 1))
+
+
+@with_all_phases
+@spec_state_test
+def test_random_fill_attestations(spec, state):
+    rng = Random(4567)
+    yield from run_with_participation(spec, state, lambda slot, comm_index, comm: rng.sample(comm, len(comm) // 3))
+
+
+@with_all_phases
+@spec_state_test
+def test_almost_full_attestations(spec, state):
+    rng = Random(8901)
+    yield from run_with_participation(spec, state, lambda slot, comm_index, comm: rng.sample(comm, len(comm) - 1))
+
+
+@with_all_phases
+@spec_state_test
+def test_full_attestation_participation(spec, state):
+    yield from run_with_participation(spec, state, lambda slot, comm_index, comm: comm)
 
 
 @with_all_phases
@@ -221,7 +257,7 @@ def test_duplicate_attestation(spec, state):
 @spec_state_test
 # Case when some eligible attestations are slashed. Modifies attesting_balance and consequently rewards/penalties.
 def test_attestations_some_slashed(spec, state):
-    attestations = prepare_state_with_full_attestations(spec, state)
+    attestations = prepare_state_with_attestations(spec, state)
     attesting_indices_before_slashings = list(spec.get_unslashed_attesting_indices(state, attestations))
 
     # Slash maximum amount of validators allowed per epoch.
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_get_source_deltas.py b/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_basic.py
similarity index 63%
rename from tests/core/pyspec/eth2spec/test/phase_0/rewards/test_get_source_deltas.py
rename to tests/core/pyspec/eth2spec/test/phase_0/rewards/test_basic.py
--- a/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_get_source_deltas.py
+++ b/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_basic.py
@@ -1,83 +1,71 @@
 from eth2spec.test.context import with_all_phases, spec_state_test
-from eth2spec.test.helpers.rewards import run_attestation_component_deltas
 import eth2spec.test.helpers.rewards as rewards_helpers
 
 
-def run_get_source_deltas(spec, state):
-    """
-    Run ``get_source_deltas``, yielding:
-      - pre-state ('pre')
-      - deltas ('deltas')
-    """
-
-    yield from run_attestation_component_deltas(
-        spec,
-        state,
-        spec.get_source_deltas,
-        spec.get_matching_source_attestations,
-    )
-
-
 @with_all_phases
 @spec_state_test
 def test_empty(spec, state):
-    yield from rewards_helpers.run_test_empty(spec, state, run_get_source_deltas)
+    yield from rewards_helpers.run_test_empty(spec, state)
 
 
 @with_all_phases
 @spec_state_test
 def test_full_all_correct(spec, state):
-    yield from rewards_helpers.run_test_full_all_correct(spec, state, run_get_source_deltas)
+    yield from rewards_helpers.run_test_full_all_correct(spec, state)
 
 
 @with_all_phases
 @spec_state_test
 def test_half_full(spec, state):
-    yield from rewards_helpers.run_test_half_full(spec, state, run_get_source_deltas)
+    yield from rewards_helpers.run_test_half_full(spec, state)
+
+
+@with_all_phases
+@spec_state_test
+def test_quarter_full(spec, state):
+    yield from rewards_helpers.run_test_partial(spec, state, 0.25)
 
 
 @with_all_phases
 @spec_state_test
 def test_full_but_partial_participation(spec, state):
-    yield from rewards_helpers.run_test_full_but_partial_participation(spec, state, run_get_source_deltas)
+    yield from rewards_helpers.run_test_full_but_partial_participation(spec, state)
 
 
 @with_all_phases
 @spec_state_test
 def test_one_attestation_one_correct(spec, state):
-    yield from rewards_helpers.run_test_one_attestation_one_correct(spec, state, run_get_source_deltas)
+    yield from rewards_helpers.run_test_one_attestation_one_correct(spec, state)
+
+
+@with_all_phases
+@spec_state_test
+def test_with_not_yet_activated_validators(spec, state):
+    yield from rewards_helpers.run_test_with_not_yet_activated_validators(spec, state)
 
 
 @with_all_phases
 @spec_state_test
 def test_with_exited_validators(spec, state):
-    yield from rewards_helpers.run_test_with_exited_validators(spec, state, run_get_source_deltas)
+    yield from rewards_helpers.run_test_with_exited_validators(spec, state)
 
 
 @with_all_phases
 @spec_state_test
 def test_with_slashed_validators(spec, state):
-    yield from rewards_helpers.run_test_with_slashed_validators(spec, state, run_get_source_deltas)
+    yield from rewards_helpers.run_test_with_slashed_validators(spec, state)
 
 
 @with_all_phases
 @spec_state_test
 def test_some_very_low_effective_balances_that_attested(spec, state):
-    yield from rewards_helpers.run_test_some_very_low_effective_balances_that_attested(
-        spec,
-        state,
-        run_get_source_deltas
-    )
+    yield from rewards_helpers.run_test_some_very_low_effective_balances_that_attested(spec, state)
 
 
 @with_all_phases
 @spec_state_test
 def test_some_very_low_effective_balances_that_did_not_attest(spec, state):
-    yield from rewards_helpers.run_test_some_very_low_effective_balances_that_did_not_attest(
-        spec,
-        state,
-        run_get_source_deltas,
-    )
+    yield from rewards_helpers.run_test_some_very_low_effective_balances_that_did_not_attest(spec, state)
 
 
 #
@@ -95,7 +83,6 @@ def test_full_half_correct_target_incorrect_head(spec, state):
         correct_target=True,
         correct_head=False,
         fraction_incorrect=0.5,
-        runner=run_get_source_deltas
     )
 
 
@@ -107,7 +94,6 @@ def test_full_correct_target_incorrect_head(spec, state):
         correct_target=True,
         correct_head=False,
         fraction_incorrect=1.0,
-        runner=run_get_source_deltas
     )
 
 
@@ -119,7 +105,6 @@ def test_full_half_incorrect_target_incorrect_head(spec, state):
         correct_target=False,
         correct_head=False,
         fraction_incorrect=0.5,
-        runner=run_get_source_deltas
     )
 
 
@@ -131,11 +116,40 @@ def test_full_half_incorrect_target_correct_head(spec, state):
         correct_target=False,
         correct_head=True,
         fraction_incorrect=0.5,
-        runner=run_get_source_deltas
     )
 
 
 @with_all_phases
 @spec_state_test
-def test_full_random(spec, state):
-    yield from rewards_helpers.run_test_full_random(spec, state, run_get_source_deltas)
+def test_full_delay_one_slot(spec, state):
+    yield from rewards_helpers.run_test_full_delay_one_slot(spec, state)
+
+
+@with_all_phases
+@spec_state_test
+def test_full_delay_max_slots(spec, state):
+    yield from rewards_helpers.run_test_full_delay_max_slots(spec, state)
+
+
+@with_all_phases
+@spec_state_test
+def test_full_mixed_delay(spec, state):
+    yield from rewards_helpers.run_test_full_mixed_delay(spec, state)
+
+
+@with_all_phases
+@spec_state_test
+def test_proposer_not_in_attestations(spec, state):
+    yield from rewards_helpers.run_test_proposer_not_in_attestations(spec, state)
+
+
+@with_all_phases
+@spec_state_test
+def test_duplicate_attestations_at_later_slots(spec, state):
+    yield from rewards_helpers.run_test_duplicate_attestations_at_later_slots(spec, state)
+
+
+@with_all_phases
+@spec_state_test
+def test_all_balances_too_low_for_reward(spec, state):
+    yield from rewards_helpers.run_test_all_balances_too_low_for_reward(spec, state)
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_get_head_deltas.py b/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_get_head_deltas.py
deleted file mode 100644
--- a/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_get_head_deltas.py
+++ /dev/null
@@ -1,130 +0,0 @@
-from eth2spec.test.context import with_all_phases, spec_state_test
-from eth2spec.test.helpers.rewards import run_attestation_component_deltas
-import eth2spec.test.helpers.rewards as rewards_helpers
-
-
-def run_get_head_deltas(spec, state):
-    """
-    Run ``get_head_deltas``, yielding:
-      - pre-state ('pre')
-      - deltas ('deltas')
-    """
-
-    yield from run_attestation_component_deltas(
-        spec,
-        state,
-        spec.get_head_deltas,
-        spec.get_matching_head_attestations,
-    )
-
-
-@with_all_phases
-@spec_state_test
-def test_empty(spec, state):
-    yield from rewards_helpers.run_test_empty(spec, state, run_get_head_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_full_all_correct(spec, state):
-    yield from rewards_helpers.run_test_full_all_correct(spec, state, run_get_head_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_half_full(spec, state):
-    yield from rewards_helpers.run_test_half_full(spec, state, run_get_head_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_full_but_partial_participation(spec, state):
-    yield from rewards_helpers.run_test_full_but_partial_participation(spec, state, run_get_head_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_one_attestation_one_correct(spec, state):
-    yield from rewards_helpers.run_test_one_attestation_one_correct(spec, state, run_get_head_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_with_exited_validators(spec, state):
-    yield from rewards_helpers.run_test_with_exited_validators(spec, state, run_get_head_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_with_slashed_validators(spec, state):
-    yield from rewards_helpers.run_test_with_slashed_validators(spec, state, run_get_head_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_some_very_low_effective_balances_that_attested(spec, state):
-    yield from rewards_helpers.run_test_some_very_low_effective_balances_that_attested(spec, state, run_get_head_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_some_very_low_effective_balances_that_did_not_attest(spec, state):
-    yield from rewards_helpers.run_test_some_very_low_effective_balances_that_did_not_attest(
-        spec,
-        state,
-        run_get_head_deltas,
-    )
-
-
-@with_all_phases
-@spec_state_test
-def test_full_half_correct_target_incorrect_head(spec, state):
-    yield from rewards_helpers.run_test_full_fraction_incorrect(
-        spec, state,
-        correct_target=True,
-        correct_head=False,
-        fraction_incorrect=0.5,
-        runner=run_get_head_deltas
-    )
-
-
-@with_all_phases
-@spec_state_test
-def test_full_correct_target_incorrect_head(spec, state):
-    yield from rewards_helpers.run_test_full_fraction_incorrect(
-        spec, state,
-        correct_target=True,
-        correct_head=False,
-        fraction_incorrect=1.0,
-        runner=run_get_head_deltas
-    )
-
-
-@with_all_phases
-@spec_state_test
-def test_full_half_incorrect_target_incorrect_head(spec, state):
-    yield from rewards_helpers.run_test_full_fraction_incorrect(
-        spec, state,
-        correct_target=False,
-        correct_head=False,
-        fraction_incorrect=0.5,
-        runner=run_get_head_deltas
-    )
-
-
-@with_all_phases
-@spec_state_test
-def test_full_half_incorrect_target_correct_head(spec, state):
-    yield from rewards_helpers.run_test_full_fraction_incorrect(
-        spec, state,
-        correct_target=False,
-        correct_head=True,
-        fraction_incorrect=0.5,
-        runner=run_get_head_deltas
-    )
-
-
-@with_all_phases
-@spec_state_test
-def test_full_random(spec, state):
-    yield from rewards_helpers.run_test_full_random(spec, state, run_get_head_deltas)
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_get_inactivity_penalty_deltas.py b/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_get_inactivity_penalty_deltas.py
deleted file mode 100644
--- a/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_get_inactivity_penalty_deltas.py
+++ /dev/null
@@ -1,210 +0,0 @@
-from eth2spec.test.context import with_all_phases, spec_state_test
-from eth2spec.test.helpers.rewards import has_enough_for_reward
-from eth2spec.test.helpers.state import next_epoch
-from eth2spec.test.helpers.rewards import Deltas
-import eth2spec.test.helpers.rewards as rewards_helpers
-
-
-def run_get_inactivity_penalty_deltas(spec, state):
-    """
-    Run ``get_inactivity_penalty_deltas``, yielding:
-      - pre-state ('pre')
-      - deltas ('deltas')
-    """
-
-    yield 'pre', state
-
-    rewards, penalties = spec.get_inactivity_penalty_deltas(state)
-
-    yield 'deltas', Deltas(rewards=rewards, penalties=penalties)
-
-    matching_attestations = spec.get_matching_target_attestations(state, spec.get_previous_epoch(state))
-    matching_attesting_indices = spec.get_unslashed_attesting_indices(state, matching_attestations)
-
-    finality_delay = spec.get_previous_epoch(state) - state.finalized_checkpoint.epoch
-    eligible_indices = spec.get_eligible_validator_indices(state)
-    for index in range(len(state.validators)):
-        assert rewards[index] == 0
-        if index not in eligible_indices:
-            assert penalties[index] == 0
-            continue
-
-        if finality_delay > spec.MIN_EPOCHS_TO_INACTIVITY_PENALTY:
-            base_penalty = spec.BASE_REWARDS_PER_EPOCH * spec.get_base_reward(state, index)
-            if not has_enough_for_reward(spec, state, index):
-                assert penalties[index] == 0
-            elif index in matching_attesting_indices:
-                assert penalties[index] == base_penalty
-            else:
-                assert penalties[index] > base_penalty
-        else:
-            assert penalties[index] == 0
-
-
-def transition_state_to_leak(spec, state, epochs=None):
-    if epochs is None:
-        epochs = spec.MIN_EPOCHS_TO_INACTIVITY_PENALTY
-    assert epochs >= spec.MIN_EPOCHS_TO_INACTIVITY_PENALTY
-
-    for _ in range(epochs):
-        next_epoch(spec, state)
-
-
-@with_all_phases
-@spec_state_test
-def test_empty_no_leak(spec, state):
-    yield from rewards_helpers.run_test_empty(spec, state, run_get_inactivity_penalty_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_empty_leak(spec, state):
-    transition_state_to_leak(spec, state)
-    yield from rewards_helpers.run_test_empty(spec, state, run_get_inactivity_penalty_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_full_no_leak(spec, state):
-    yield from rewards_helpers.run_test_full_all_correct(spec, state, run_get_inactivity_penalty_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_full_leak(spec, state):
-    transition_state_to_leak(spec, state)
-    yield from rewards_helpers.run_test_full_all_correct(spec, state, run_get_inactivity_penalty_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_half_full_no_leak(spec, state):
-    yield from rewards_helpers.run_test_half_full(spec, state, run_get_inactivity_penalty_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_half_full_leak(spec, state):
-    transition_state_to_leak(spec, state)
-    yield from rewards_helpers.run_test_half_full(spec, state, run_get_inactivity_penalty_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_quarter_full_no_leak(spec, state):
-    yield from rewards_helpers.run_test_partial(spec, state, 0.25, run_get_inactivity_penalty_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_quarter_full_leak(spec, state):
-    transition_state_to_leak(spec, state)
-    yield from rewards_helpers.run_test_partial(spec, state, 0.25, run_get_inactivity_penalty_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_full_but_partial_participation_no_leak(spec, state):
-    yield from rewards_helpers.run_test_full_but_partial_participation(spec, state, run_get_inactivity_penalty_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_full_but_partial_participation_leak(spec, state):
-    transition_state_to_leak(spec, state)
-    yield from rewards_helpers.run_test_full_but_partial_participation(spec, state, run_get_inactivity_penalty_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_with_exited_validators_no_leak(spec, state):
-    yield from rewards_helpers.run_test_with_exited_validators(spec, state, run_get_inactivity_penalty_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_with_exited_validators_leak(spec, state):
-    transition_state_to_leak(spec, state)
-    yield from rewards_helpers.run_test_with_exited_validators(spec, state, run_get_inactivity_penalty_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_with_slashed_validators_no_leak(spec, state):
-    yield from rewards_helpers.run_test_with_slashed_validators(spec, state, run_get_inactivity_penalty_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_with_slashed_validators_leak(spec, state):
-    transition_state_to_leak(spec, state)
-    yield from rewards_helpers.run_test_with_slashed_validators(spec, state, run_get_inactivity_penalty_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_some_very_low_effective_balances_that_attested_no_leak(spec, state):
-    yield from rewards_helpers.run_test_some_very_low_effective_balances_that_attested(
-        spec,
-        state,
-        run_get_inactivity_penalty_deltas,
-    )
-
-
-@with_all_phases
-@spec_state_test
-def test_some_very_low_effective_balances_that_attested_leak(spec, state):
-    transition_state_to_leak(spec, state)
-    yield from rewards_helpers.run_test_some_very_low_effective_balances_that_attested(
-        spec,
-        state,
-        run_get_inactivity_penalty_deltas,
-    )
-
-
-@with_all_phases
-@spec_state_test
-def test_some_very_low_effective_balances_that_did_not_attest_no_leak(spec, state):
-    yield from rewards_helpers.run_test_some_very_low_effective_balances_that_did_not_attest(
-        spec,
-        state,
-        run_get_inactivity_penalty_deltas,
-    )
-
-
-@with_all_phases
-@spec_state_test
-def test_some_very_low_effective_balances_that_did_not_attest_leak(spec, state):
-    transition_state_to_leak(spec, state)
-    yield from rewards_helpers.run_test_some_very_low_effective_balances_that_did_not_attest(
-        spec,
-        state,
-        run_get_inactivity_penalty_deltas,
-    )
-
-
-@with_all_phases
-@spec_state_test
-def test_full_random_no_leak(spec, state):
-    yield from rewards_helpers.run_test_full_random(spec, state, run_get_inactivity_penalty_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_full_random_leak(spec, state):
-    transition_state_to_leak(spec, state)
-    yield from rewards_helpers.run_test_full_random(spec, state, run_get_inactivity_penalty_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_full_random_five_epoch_leak(spec, state):
-    transition_state_to_leak(spec, state, epochs=5)
-    yield from rewards_helpers.run_test_full_random(spec, state, run_get_inactivity_penalty_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_full_random_ten_epoch_leak(spec, state):
-    transition_state_to_leak(spec, state, epochs=10)
-    yield from rewards_helpers.run_test_full_random(spec, state, run_get_inactivity_penalty_deltas)
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_get_inclusion_delay_deltas.py b/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_get_inclusion_delay_deltas.py
deleted file mode 100644
--- a/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_get_inclusion_delay_deltas.py
+++ /dev/null
@@ -1,207 +0,0 @@
-from random import Random
-
-from eth2spec.test.context import with_all_phases, spec_state_test
-from eth2spec.test.helpers.attestations import prepare_state_with_full_attestations
-from eth2spec.test.helpers.rewards import Deltas, has_enough_for_reward
-import eth2spec.test.helpers.rewards as rewards_helpers
-
-
-def run_get_inclusion_delay_deltas(spec, state):
-    """
-    Run ``get_inclusion_delay_deltas``, yielding:
-      - pre-state ('pre')
-      - deltas ('deltas')
-    """
-
-    yield 'pre', state
-
-    rewards, penalties = spec.get_inclusion_delay_deltas(state)
-
-    yield 'deltas', Deltas(rewards=rewards, penalties=penalties)
-
-    eligible_attestations = spec.get_matching_source_attestations(state, spec.get_previous_epoch(state))
-    attesting_indices = spec.get_unslashed_attesting_indices(state, eligible_attestations)
-
-    rewarded_indices = set()
-    rewarded_proposer_indices = set()
-    # Ensure attesters with enough balance are rewarded for attestations
-    # Track those that are rewarded and track proposers that should be rewarded
-    for index in range(len(state.validators)):
-        if index in attesting_indices and has_enough_for_reward(spec, state, index):
-            assert rewards[index] > 0
-            rewarded_indices.add(index)
-
-            # Track proposer of earliest included attestation for the validator defined by index
-            earliest_attestation = min([
-                a for a in eligible_attestations
-                if index in spec.get_attesting_indices(state, a.data, a.aggregation_bits)
-            ], key=lambda a: a.inclusion_delay)
-            rewarded_proposer_indices.add(earliest_attestation.proposer_index)
-
-    # Ensure all expected proposers have been rewarded
-    # Track rewarde indices
-    proposing_indices = [a.proposer_index for a in eligible_attestations]
-    for index in proposing_indices:
-        if index in rewarded_proposer_indices:
-            assert rewards[index] > 0
-            rewarded_indices.add(index)
-
-    # Ensure all expected non-rewarded indices received no reward
-    for index in range(len(state.validators)):
-        assert penalties[index] == 0
-        if index not in rewarded_indices:
-            assert rewards[index] == 0
-
-
-@with_all_phases
-@spec_state_test
-def test_empty(spec, state):
-    yield from rewards_helpers.run_test_empty(spec, state, run_get_inclusion_delay_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_full(spec, state):
-    yield from rewards_helpers.run_test_full_all_correct(spec, state, run_get_inclusion_delay_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_half_full(spec, state):
-    yield from rewards_helpers.run_test_half_full(spec, state, run_get_inclusion_delay_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_quarter_full(spec, state):
-    yield from rewards_helpers.run_test_partial(spec, state, 0.25, run_get_inclusion_delay_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_full_but_partial_participation(spec, state):
-    yield from rewards_helpers.run_test_full_but_partial_participation(spec, state, run_get_inclusion_delay_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_with_exited_validators(spec, state):
-    yield from rewards_helpers.run_test_with_exited_validators(spec, state, run_get_inclusion_delay_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_with_slashed_validators(spec, state):
-    yield from rewards_helpers.run_test_with_slashed_validators(spec, state, run_get_inclusion_delay_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_some_very_low_effective_balances_that_attested(spec, state):
-    yield from rewards_helpers.run_test_some_very_low_effective_balances_that_attested(
-        spec,
-        state,
-        run_get_inclusion_delay_deltas
-    )
-
-
-@with_all_phases
-@spec_state_test
-def test_full_random(spec, state):
-    yield from rewards_helpers.run_test_full_random(spec, state, run_get_inclusion_delay_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_full_delay_one_slot(spec, state):
-    prepare_state_with_full_attestations(spec, state)
-    for a in state.previous_epoch_attestations:
-        a.inclusion_delay += 1
-
-    yield from run_get_inclusion_delay_deltas(spec, state)
-
-
-@with_all_phases
-@spec_state_test
-def test_full_delay_max_slots(spec, state):
-    prepare_state_with_full_attestations(spec, state)
-    for a in state.previous_epoch_attestations:
-        a.inclusion_delay += spec.SLOTS_PER_EPOCH
-
-    yield from run_get_inclusion_delay_deltas(spec, state)
-
-
-@with_all_phases
-@spec_state_test
-def test_full_mixed_delay(spec, state):
-    rng = Random(1234)
-
-    prepare_state_with_full_attestations(spec, state)
-    for a in state.previous_epoch_attestations:
-        a.inclusion_delay = rng.randint(1, spec.SLOTS_PER_EPOCH)
-
-    yield from run_get_inclusion_delay_deltas(spec, state)
-
-
-@with_all_phases
-@spec_state_test
-def test_proposer_not_in_attestations(spec, state):
-    prepare_state_with_full_attestations(spec, state)
-
-    # Get an attestation where the proposer is not in the committee
-    non_proposer_attestations = []
-    for a in state.previous_epoch_attestations:
-        if a.proposer_index not in spec.get_unslashed_attesting_indices(state, [a]):
-            non_proposer_attestations.append(a)
-
-    assert any(non_proposer_attestations)
-    state.previous_epoch_attestations = non_proposer_attestations
-
-    yield from run_get_inclusion_delay_deltas(spec, state)
-
-
-@with_all_phases
-@spec_state_test
-def test_duplicate_attestations_at_later_slots(spec, state):
-    prepare_state_with_full_attestations(spec, state)
-
-    # Remove 2/3 of attestations to make it more interesting
-    num_attestations = int(len(state.previous_epoch_attestations) * 0.33)
-    state.previous_epoch_attestations = state.previous_epoch_attestations[:num_attestations]
-
-    # Get map of the proposer at each slot to make valid-looking duplicate attestations
-    per_slot_proposers = {
-        (a.data.slot + a.inclusion_delay): a.proposer_index
-        for a in state.previous_epoch_attestations
-    }
-    max_slot = max([a.data.slot + a.inclusion_delay for a in state.previous_epoch_attestations])
-    later_attestations = []
-    for a in state.previous_epoch_attestations:
-        # Only have proposers for previous epoch so do not create later
-        # duplicate if slot exceeds the max slot in previous_epoch_attestations
-        if a.data.slot + a.inclusion_delay >= max_slot:
-            continue
-        later_a = a.copy()
-        later_a.inclusion_delay += 1
-        later_a.proposer_index = per_slot_proposers[later_a.data.slot + later_a.inclusion_delay]
-        later_attestations.append(later_a)
-
-    assert any(later_attestations)
-
-    state.previous_epoch_attestations = sorted(
-        state.previous_epoch_attestations + later_attestations,
-        key=lambda a: a.data.slot + a.inclusion_delay
-    )
-
-    yield from run_get_inclusion_delay_deltas(spec, state)
-
-
-@with_all_phases
-@spec_state_test
-def test_all_balances_too_low_for_reward(spec, state):
-    prepare_state_with_full_attestations(spec, state)
-
-    for index in range(len(state.validators)):
-        state.validators[index].effective_balance = 10
-
-    yield from run_get_inclusion_delay_deltas(spec, state)
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_get_target_deltas.py b/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_get_target_deltas.py
deleted file mode 100644
--- a/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_get_target_deltas.py
+++ /dev/null
@@ -1,128 +0,0 @@
-from eth2spec.test.context import with_all_phases, spec_state_test
-from eth2spec.test.helpers.rewards import run_attestation_component_deltas
-import eth2spec.test.helpers.rewards as rewards_helpers
-
-
-def run_get_target_deltas(spec, state):
-    """
-    Run ``get_target_deltas``, yielding:
-      - pre-state ('pre')
-      - deltas ('deltas')
-    """
-
-    yield from run_attestation_component_deltas(
-        spec,
-        state,
-        spec.get_target_deltas,
-        spec.get_matching_target_attestations,
-    )
-
-
-@with_all_phases
-@spec_state_test
-def test_empty(spec, state):
-    yield from rewards_helpers.run_test_empty(spec, state, run_get_target_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_full_all_correct(spec, state):
-    yield from rewards_helpers.run_test_full_all_correct(spec, state, run_get_target_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_half_full(spec, state):
-    yield from rewards_helpers.run_test_half_full(spec, state, run_get_target_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_full_but_partial_participation(spec, state):
-    yield from rewards_helpers.run_test_full_but_partial_participation(spec, state, run_get_target_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_one_attestation_one_correct(spec, state):
-    yield from rewards_helpers.run_test_one_attestation_one_correct(spec, state, run_get_target_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_with_slashed_validators(spec, state):
-    yield from rewards_helpers.run_test_with_slashed_validators(spec, state, run_get_target_deltas)
-
-
-@with_all_phases
-@spec_state_test
-def test_some_very_low_effective_balances_that_attested(spec, state):
-    yield from rewards_helpers.run_test_some_very_low_effective_balances_that_attested(
-        spec,
-        state,
-        run_get_target_deltas
-    )
-
-
-@with_all_phases
-@spec_state_test
-def test_some_very_low_effective_balances_that_did_not_attest(spec, state):
-    yield from rewards_helpers.run_test_some_very_low_effective_balances_that_did_not_attest(
-        spec,
-        state,
-        run_get_target_deltas,
-    )
-
-
-@with_all_phases
-@spec_state_test
-def test_full_half_correct_target_incorrect_head(spec, state):
-    yield from rewards_helpers.run_test_full_fraction_incorrect(
-        spec, state,
-        correct_target=True,
-        correct_head=False,
-        fraction_incorrect=0.5,
-        runner=run_get_target_deltas
-    )
-
-
-@with_all_phases
-@spec_state_test
-def test_full_correct_target_incorrect_head(spec, state):
-    yield from rewards_helpers.run_test_full_fraction_incorrect(
-        spec, state,
-        correct_target=True,
-        correct_head=False,
-        fraction_incorrect=1.0,
-        runner=run_get_target_deltas
-    )
-
-
-@with_all_phases
-@spec_state_test
-def test_full_half_incorrect_target_incorrect_head(spec, state):
-    yield from rewards_helpers.run_test_full_fraction_incorrect(
-        spec, state,
-        correct_target=False,
-        correct_head=False,
-        fraction_incorrect=0.5,
-        runner=run_get_target_deltas
-    )
-
-
-@with_all_phases
-@spec_state_test
-def test_full_half_incorrect_target_correct_head(spec, state):
-    yield from rewards_helpers.run_test_full_fraction_incorrect(
-        spec, state,
-        correct_target=False,
-        correct_head=True,
-        fraction_incorrect=0.5,
-        runner=run_get_target_deltas
-    )
-
-
-@with_all_phases
-@spec_state_test
-def test_full_random(spec, state):
-    yield from rewards_helpers.run_test_full_random(spec, state, run_get_target_deltas)
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_leak.py b/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_leak.py
new file mode 100644
--- /dev/null
+++ b/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_leak.py
@@ -0,0 +1,190 @@
+from eth2spec.test.context import with_all_phases, spec_state_test
+from eth2spec.test.helpers.state import next_epoch
+import eth2spec.test.helpers.rewards as rewards_helpers
+from lru import LRU
+
+
+def transition_state_to_leak(spec, state, epochs=None):
+    if epochs is None:
+        epochs = spec.MIN_EPOCHS_TO_INACTIVITY_PENALTY
+    assert epochs >= spec.MIN_EPOCHS_TO_INACTIVITY_PENALTY
+
+    for _ in range(epochs):
+        next_epoch(spec, state)
+
+
+_cache_dict = LRU(size=10)
+
+
+def leaking(epochs=None):
+
+    def deco(fn):
+        def entry(*args, spec, state, **kw):
+            # If the pre-state is not already known in the LRU, then take it,
+            # transition it to leak, and put it in the LRU.
+            # The input state is likely already cached, so the hash-tree-root does not affect speed.
+            key = (state.hash_tree_root(), spec.MIN_EPOCHS_TO_INACTIVITY_PENALTY, spec.SLOTS_PER_EPOCH, epochs)
+            global _cache_dict
+            if key not in _cache_dict:
+                transition_state_to_leak(spec, state, epochs=epochs)
+                _cache_dict[key] = state.get_backing()  # cache the tree structure, not the view wrapping it.
+
+            # Take an entry out of the LRU.
+            # No copy is necessary, as we wrap the immutable backing with a new view.
+            state = spec.BeaconState(backing=_cache_dict[key])
+            return fn(*args, spec=spec, state=state, **kw)
+        return entry
+    return deco
+
+
+@with_all_phases
+@spec_state_test
+@leaking()
+def test_empty_leak(spec, state):
+    yield from rewards_helpers.run_test_empty(spec, state)
+
+
+@with_all_phases
+@spec_state_test
+@leaking()
+def test_full_leak(spec, state):
+    yield from rewards_helpers.run_test_full_all_correct(spec, state)
+
+
+@with_all_phases
+@spec_state_test
+@leaking()
+def test_half_full_leak(spec, state):
+    yield from rewards_helpers.run_test_half_full(spec, state)
+
+
+@with_all_phases
+@spec_state_test
+@leaking()
+def test_quarter_full_leak(spec, state):
+    yield from rewards_helpers.run_test_partial(spec, state, 0.25)
+
+
+@with_all_phases
+@spec_state_test
+@leaking()
+def test_full_but_partial_participation_leak(spec, state):
+    yield from rewards_helpers.run_test_full_but_partial_participation(spec, state)
+
+
+@with_all_phases
+@spec_state_test
+@leaking()
+def test_one_attestation_one_correct_leak(spec, state):
+    yield from rewards_helpers.run_test_one_attestation_one_correct(spec, state)
+
+
+@with_all_phases
+@spec_state_test
+@leaking()
+def test_with_not_yet_activated_validators_leak(spec, state):
+    yield from rewards_helpers.run_test_with_not_yet_activated_validators(spec, state)
+
+
+@with_all_phases
+@spec_state_test
+@leaking()
+def test_with_exited_validators_leak(spec, state):
+    yield from rewards_helpers.run_test_with_exited_validators(spec, state)
+
+
+@with_all_phases
+@spec_state_test
+@leaking()
+def test_with_slashed_validators_leak(spec, state):
+    yield from rewards_helpers.run_test_with_slashed_validators(spec, state)
+
+
+@with_all_phases
+@spec_state_test
+@leaking()
+def test_some_very_low_effective_balances_that_attested_leak(spec, state):
+    yield from rewards_helpers.run_test_some_very_low_effective_balances_that_attested(spec, state)
+
+
+@with_all_phases
+@spec_state_test
+@leaking()
+def test_some_very_low_effective_balances_that_did_not_attest_leak(spec, state):
+    yield from rewards_helpers.run_test_some_very_low_effective_balances_that_did_not_attest(spec, state)
+
+
+#
+# NOTE: No source incorrect tests
+# All PendingAttestations in state have source validated
+# We choose to keep this invariant in these tests to not force clients to test with degenerate states
+#
+
+
+@with_all_phases
+@spec_state_test
+@leaking()
+def test_full_half_correct_target_incorrect_head_leak(spec, state):
+    yield from rewards_helpers.run_test_full_fraction_incorrect(
+        spec, state,
+        correct_target=True,
+        correct_head=False,
+        fraction_incorrect=0.5,
+    )
+
+
+@with_all_phases
+@spec_state_test
+@leaking()
+def test_full_correct_target_incorrect_head_leak(spec, state):
+    yield from rewards_helpers.run_test_full_fraction_incorrect(
+        spec, state,
+        correct_target=True,
+        correct_head=False,
+        fraction_incorrect=1.0,
+    )
+
+
+@with_all_phases
+@spec_state_test
+@leaking()
+def test_full_half_incorrect_target_incorrect_head_leak(spec, state):
+    yield from rewards_helpers.run_test_full_fraction_incorrect(
+        spec, state,
+        correct_target=False,
+        correct_head=False,
+        fraction_incorrect=0.5,
+    )
+
+
+@with_all_phases
+@spec_state_test
+@leaking()
+def test_full_half_incorrect_target_correct_head_leak(spec, state):
+    yield from rewards_helpers.run_test_full_fraction_incorrect(
+        spec, state,
+        correct_target=False,
+        correct_head=True,
+        fraction_incorrect=0.5,
+    )
+
+
+@with_all_phases
+@spec_state_test
+@leaking()
+def test_full_random_leak(spec, state):
+    yield from rewards_helpers.run_test_full_random(spec, state)
+
+
+@with_all_phases
+@spec_state_test
+@leaking(epochs=5)
+def test_full_random_five_epoch_leak(spec, state):
+    yield from rewards_helpers.run_test_full_random(spec, state)
+
+
+@with_all_phases
+@spec_state_test
+@leaking(epochs=10)
+def test_full_random_ten_epoch_leak(spec, state):
+    yield from rewards_helpers.run_test_full_random(spec, state)
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_random.py b/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_random.py
new file mode 100644
--- /dev/null
+++ b/tests/core/pyspec/eth2spec/test/phase_0/rewards/test_random.py
@@ -0,0 +1,45 @@
+from random import Random
+
+from eth2spec.test.context import (
+    with_all_phases,
+    spec_test,
+    spec_state_test,
+    with_custom_state,
+    single_phase,
+    low_balances, misc_balances,
+)
+import eth2spec.test.helpers.rewards as rewards_helpers
+
+
+@with_all_phases
+@spec_state_test
+def test_full_random_0(spec, state):
+    yield from rewards_helpers.run_test_full_random(spec, state, rng=Random(1010))
+
+
+@with_all_phases
+@spec_state_test
+def test_full_random_1(spec, state):
+    yield from rewards_helpers.run_test_full_random(spec, state, rng=Random(2020))
+
+
+@with_all_phases
+@spec_state_test
+def test_full_random_2(spec, state):
+    yield from rewards_helpers.run_test_full_random(spec, state, rng=Random(3030))
+
+
+@with_all_phases
+@with_custom_state(balances_fn=low_balances, threshold_fn=lambda spec: spec.EJECTION_BALANCE)
+@spec_test
+@single_phase
+def test_full_random_low_balances(spec, state):
+    yield from rewards_helpers.run_test_full_random(spec, state)
+
+
+@with_all_phases
+@with_custom_state(balances_fn=misc_balances, threshold_fn=lambda spec: spec.EJECTION_BALANCE)
+@spec_test
+@single_phase
+def test_full_random_misc_balances(spec, state):
+    yield from rewards_helpers.run_test_full_random(spec, state)
diff --git a/tests/core/pyspec/eth2spec/test/phase_0/sanity/test_blocks.py b/tests/core/pyspec/eth2spec/test/phase_0/sanity/test_blocks.py
--- a/tests/core/pyspec/eth2spec/test/phase_0/sanity/test_blocks.py
+++ b/tests/core/pyspec/eth2spec/test/phase_0/sanity/test_blocks.py
@@ -10,7 +10,11 @@
     transition_unsigned_block,
 )
 from eth2spec.test.helpers.keys import privkeys, pubkeys
-from eth2spec.test.helpers.attester_slashings import get_valid_attester_slashing, get_indexed_attestation_participants
+from eth2spec.test.helpers.attester_slashings import (
+    get_valid_attester_slashing_by_indices,
+    get_valid_attester_slashing,
+    get_indexed_attestation_participants,
+)
 from eth2spec.test.helpers.proposer_slashings import get_valid_proposer_slashing, check_proposer_slashing_effect
 from eth2spec.test.helpers.attestations import get_valid_attestation, fill_block_shard_transitions_by_attestations
 from eth2spec.test.helpers.deposits import prepare_state_and_deposit
@@ -409,13 +413,14 @@ def test_multiple_different_proposer_slashings_same_block(spec, state):
         check_proposer_slashing_effect(spec, pre_state, state, slashed_index)
 
 
-def check_attester_slashing_effect(spec, pre_state, state, validator_index):
-    slashed_validator = state.validators[validator_index]
-    assert slashed_validator.slashed
-    assert slashed_validator.exit_epoch < spec.FAR_FUTURE_EPOCH
-    assert slashed_validator.withdrawable_epoch < spec.FAR_FUTURE_EPOCH
-    # lost whistleblower reward
-    assert get_balance(state, validator_index) < get_balance(pre_state, validator_index)
+def check_attester_slashing_effect(spec, pre_state, state, slashed_indices):
+    for slashed_index in slashed_indices:
+        slashed_validator = state.validators[slashed_index]
+        assert slashed_validator.slashed
+        assert slashed_validator.exit_epoch < spec.FAR_FUTURE_EPOCH
+        assert slashed_validator.withdrawable_epoch < spec.FAR_FUTURE_EPOCH
+        # lost whistleblower reward
+        assert get_balance(state, slashed_index) < get_balance(pre_state, slashed_index)
 
     proposer_index = spec.get_beacon_proposer_index(state)
     # gained whistleblower reward
@@ -429,9 +434,9 @@ def test_attester_slashing(spec, state):
     pre_state = state.copy()
 
     attester_slashing = get_valid_attester_slashing(spec, state, signed_1=True, signed_2=True)
-    validator_index = get_indexed_attestation_participants(spec, attester_slashing.attestation_1)[0]
+    slashed_indices = get_indexed_attestation_participants(spec, attester_slashing.attestation_1)
 
-    assert not state.validators[validator_index].slashed
+    assert not any(state.validators[i].slashed for i in slashed_indices)
 
     yield 'pre', state
 
@@ -446,11 +451,118 @@ def test_attester_slashing(spec, state):
     yield 'blocks', [signed_block]
     yield 'post', state
 
-    check_attester_slashing_effect(spec, pre_state, state, validator_index)
+    check_attester_slashing_effect(spec, pre_state, state, slashed_indices)
+
+
+@with_all_phases
+@spec_state_test
+def test_duplicate_attester_slashing(spec, state):
+    # Skip test if config cannot handle multiple AttesterSlashings per block
+    if spec.MAX_ATTESTER_SLASHINGS < 2:
+        return
+
+    attester_slashing = get_valid_attester_slashing(spec, state, signed_1=True, signed_2=True)
+    attester_slashings = [attester_slashing, attester_slashing.copy()]
+    slashed_indices = get_indexed_attestation_participants(spec, attester_slashing.attestation_1)
+
+    assert not any(state.validators[i].slashed for i in slashed_indices)
+
+    yield 'pre', state
+
+    #
+    # Add to state via block transition
+    #
+    block = build_empty_block_for_next_slot(spec, state)
+    block.body.attester_slashings = attester_slashings
+
+    signed_block = state_transition_and_sign_block(spec, state, block, expect_fail=True)
+
+    yield 'blocks', [signed_block]
+    yield 'post', None
+
+
+# All AttesterSlashing tests should be adopted for Phase 1 but helper support is not yet there
+
+@with_phases(['phase0'])
+@spec_state_test
+def test_multiple_attester_slashings_no_overlap(spec, state):
+    # Skip test if config cannot handle multiple AttesterSlashings per block
+    if spec.MAX_ATTESTER_SLASHINGS < 2:
+        return
+
+    # copy for later balance lookups.
+    pre_state = state.copy()
+
+    full_indices = spec.get_active_validator_indices(state, spec.get_current_epoch(state))[:8]
+    half_length = len(full_indices) // 2
+
+    attester_slashing_1 = get_valid_attester_slashing_by_indices(
+        spec, state,
+        full_indices[:half_length], signed_1=True, signed_2=True,
+    )
+    attester_slashing_2 = get_valid_attester_slashing_by_indices(
+        spec, state,
+        full_indices[half_length:], signed_1=True, signed_2=True,
+    )
+    attester_slashings = [attester_slashing_1, attester_slashing_2]
+
+    assert not any(state.validators[i].slashed for i in full_indices)
+
+    yield 'pre', state
+
+    #
+    # Add to state via block transition
+    #
+    block = build_empty_block_for_next_slot(spec, state)
+    block.body.attester_slashings = attester_slashings
+
+    signed_block = state_transition_and_sign_block(spec, state, block)
+
+    yield 'blocks', [signed_block]
+    yield 'post', state
+
+    check_attester_slashing_effect(spec, pre_state, state, full_indices)
+
+
+@with_phases(['phase0'])
+@spec_state_test
+def test_multiple_attester_slashings_partial_overlap(spec, state):
+    # Skip test if config cannot handle multiple AttesterSlashings per block
+    if spec.MAX_ATTESTER_SLASHINGS < 2:
+        return
+
+    # copy for later balance lookups.
+    pre_state = state.copy()
+
+    full_indices = spec.get_active_validator_indices(state, spec.get_current_epoch(state))[:8]
+    one_third_length = len(full_indices) // 3
+
+    attester_slashing_1 = get_valid_attester_slashing_by_indices(
+        spec, state,
+        full_indices[:one_third_length * 2], signed_1=True, signed_2=True,
+    )
+    attester_slashing_2 = get_valid_attester_slashing_by_indices(
+        spec, state,
+        full_indices[one_third_length:], signed_1=True, signed_2=True,
+    )
+    attester_slashings = [attester_slashing_1, attester_slashing_2]
+
+    assert not any(state.validators[i].slashed for i in full_indices)
+
+    yield 'pre', state
+
+    #
+    # Add to state via block transition
+    #
+    block = build_empty_block_for_next_slot(spec, state)
+    block.body.attester_slashings = attester_slashings
+
+    signed_block = state_transition_and_sign_block(spec, state, block)
+
+    yield 'blocks', [signed_block]
+    yield 'post', state
 
-# TODO: currently mainnet limits attester-slashings per block to 1.
-# When this is increased, it should be tested to cover various combinations
-# of duplicate slashings and overlaps of slashed attestations within the same block
+    check_attester_slashing_effect(spec, pre_state, state, full_indices)
 
 
 @with_all_phases
@@ -614,7 +726,7 @@ def create_signed_exit(index):
     return [create_signed_exit(index) for index in indices]
 
 
-# In phase1 a committee is computed for PERSISTENT_COMMITTEE_PERIOD slots ago,
+# In phase1 a committee is computed for SHARD_COMMITTEE_PERIOD slots ago,
 # exceeding the minimal-config randao mixes memory size.
 # Applies to all voluntary-exit sanity block tests.
 
@@ -623,8 +735,8 @@ def create_signed_exit(index):
 def test_voluntary_exit(spec, state):
     validator_index = spec.get_active_validator_indices(state, spec.get_current_epoch(state))[-1]
 
-    # move state forward PERSISTENT_COMMITTEE_PERIOD epochs to allow for exit
-    state.slot += spec.PERSISTENT_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH
+    # move state forward SHARD_COMMITTEE_PERIOD epochs to allow for exit
+    state.slot += spec.SHARD_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH
 
     signed_exits = prepare_signed_exits(spec, state, [validator_index])
     yield 'pre', state
@@ -651,8 +763,8 @@ def test_voluntary_exit(spec, state):
 def test_double_validator_exit_same_block(spec, state):
     validator_index = spec.get_active_validator_indices(state, spec.get_current_epoch(state))[-1]
 
-    # move state forward PERSISTENT_COMMITTEE_PERIOD epochs to allow for exit
-    state.slot += spec.PERSISTENT_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH
+    # move state forward SHARD_COMMITTEE_PERIOD epochs to allow for exit
+    state.slot += spec.SHARD_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH
 
     # Same index tries to exit twice, but should only be able to do so once.
     signed_exits = prepare_signed_exits(spec, state, [validator_index, validator_index])
@@ -674,8 +786,8 @@ def test_multiple_different_validator_exits_same_block(spec, state):
         spec.get_active_validator_indices(state, spec.get_current_epoch(state))[i]
         for i in range(3)
     ]
-    # move state forward PERSISTENT_COMMITTEE_PERIOD epochs to allow for exit
-    state.slot += spec.PERSISTENT_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH
+    # move state forward SHARD_COMMITTEE_PERIOD epochs to allow for exit
+    state.slot += spec.SHARD_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH
 
     signed_exits = prepare_signed_exits(spec, state, validator_indices)
     yield 'pre', state
diff --git a/tests/core/pyspec/eth2spec/test/validator/test_validator_unittest.py b/tests/core/pyspec/eth2spec/test/validator/test_validator_unittest.py
new file mode 100644
--- /dev/null
+++ b/tests/core/pyspec/eth2spec/test/validator/test_validator_unittest.py
@@ -0,0 +1,395 @@
+from eth2spec.test.context import spec_state_test, never_bls, with_all_phases
+from eth2spec.test.helpers.attestations import build_attestation_data
+from eth2spec.test.helpers.block import build_empty_block
+from eth2spec.test.helpers.deposits import prepare_state_and_deposit
+from eth2spec.test.helpers.keys import privkeys, pubkeys
+from eth2spec.test.helpers.state import next_epoch
+from eth2spec.utils import bls
+from eth2spec.utils.ssz.ssz_typing import Bitlist
+
+
+def run_get_signature_test(spec, state, obj, domain, get_signature_fn, privkey, pubkey):
+    signature = get_signature_fn(state, obj, privkey)
+    signing_root = spec.compute_signing_root(obj, domain)
+    assert bls.Verify(pubkey, signing_root, signature)
+
+
+def run_get_committee_assignment(spec, state, epoch, validator_index, valid=True):
+    try:
+        assignment = spec.get_committee_assignment(state, epoch, validator_index)
+        committee, committee_index, slot = assignment
+        assert spec.compute_epoch_at_slot(slot) == epoch
+        assert committee == spec.get_beacon_committee(state, slot, committee_index)
+        assert committee_index < spec.get_committee_count_at_slot(state, slot)
+        assert validator_index in committee
+        assert valid
+    except AssertionError:
+        assert not valid
+    else:
+        assert valid
+
+
+def run_is_candidate_block(spec, eth1_block, period_start, success=True):
+    assert success == spec.is_candidate_block(eth1_block, period_start)
+
+
+def get_min_new_period_epochs(spec):
+    return int(
+        spec.SECONDS_PER_ETH1_BLOCK * spec.ETH1_FOLLOW_DISTANCE * 2  # to seconds
+        / spec.SECONDS_PER_SLOT / spec.SLOTS_PER_EPOCH
+    )
+
+
+def get_mock_aggregate(spec):
+    return spec.Attestation(
+        data=spec.AttestationData(
+            slot=10,
+        )
+    )
+
+
+#
+# Becoming a validator
+#
+
+
+@with_all_phases
+@spec_state_test
+@never_bls
+def test_check_if_validator_active(spec, state):
+    active_validator_index = len(state.validators) - 1
+    assert spec.check_if_validator_active(state, active_validator_index)
+    new_validator_index = len(state.validators)
+    amount = spec.MAX_EFFECTIVE_BALANCE
+    deposit = prepare_state_and_deposit(spec, state, new_validator_index, amount, signed=True)
+    spec.process_deposit(state, deposit)
+    assert not spec.check_if_validator_active(state, new_validator_index)
+
+
+#
+# Validator assignments
+#
+
+
+@with_all_phases
+@spec_state_test
+@never_bls
+def test_get_committee_assignment_current_epoch(spec, state):
+    epoch = spec.get_current_epoch(state)
+    validator_index = len(state.validators) - 1
+    run_get_committee_assignment(spec, state, epoch, validator_index, valid=True)
+
+
+@with_all_phases
+@spec_state_test
+@never_bls
+def test_get_committee_assignment_next_epoch(spec, state):
+    epoch = spec.get_current_epoch(state) + 1
+    validator_index = len(state.validators) - 1
+    run_get_committee_assignment(spec, state, epoch, validator_index, valid=True)
+
+
+@with_all_phases
+@spec_state_test
+@never_bls
+def test_get_committee_assignment_out_bound_epoch(spec, state):
+    epoch = spec.get_current_epoch(state) + 2
+    validator_index = len(state.validators) - 1
+    run_get_committee_assignment(spec, state, epoch, validator_index, valid=False)
+
+
+@with_all_phases
+@spec_state_test
+@never_bls
+def test_is_proposer(spec, state):
+    proposer_index = spec.get_beacon_proposer_index(state)
+    assert spec.is_proposer(state, proposer_index)
+
+    proposer_index = proposer_index + 1 % len(state.validators)
+    assert not spec.is_proposer(state, proposer_index)
+
+
+#
+# Beacon chain responsibilities
+#
+
+
+# Block proposal
+
+
+@with_all_phases
+@spec_state_test
+def test_get_epoch_signature(spec, state):
+    block = spec.BeaconBlock()
+    privkey = privkeys[0]
+    pubkey = pubkeys[0]
+    domain = spec.get_domain(state, spec.DOMAIN_RANDAO, spec.compute_epoch_at_slot(block.slot))
+    run_get_signature_test(
+        spec=spec,
+        state=state,
+        obj=block,
+        domain=domain,
+        get_signature_fn=spec.get_epoch_signature,
+        privkey=privkey,
+        pubkey=pubkey,
+    )
+
+
+@with_all_phases
+@spec_state_test
+def test_is_candidate_block(spec, state):
+    period_start = spec.SECONDS_PER_ETH1_BLOCK * spec.ETH1_FOLLOW_DISTANCE * 2 + 1000
+    run_is_candidate_block(
+        spec,
+        spec.Eth1Block(timestamp=period_start - spec.SECONDS_PER_ETH1_BLOCK * spec.ETH1_FOLLOW_DISTANCE),
+        period_start,
+        success=True,
+    )
+    run_is_candidate_block(
+        spec,
+        spec.Eth1Block(timestamp=period_start - spec.SECONDS_PER_ETH1_BLOCK * spec.ETH1_FOLLOW_DISTANCE + 1),
+        period_start,
+        success=False,
+    )
+    run_is_candidate_block(
+        spec,
+        spec.Eth1Block(timestamp=period_start - spec.SECONDS_PER_ETH1_BLOCK * spec.ETH1_FOLLOW_DISTANCE * 2),
+        period_start,
+        success=True,
+    )
+    run_is_candidate_block(
+        spec,
+        spec.Eth1Block(timestamp=period_start - spec.SECONDS_PER_ETH1_BLOCK * spec.ETH1_FOLLOW_DISTANCE * 2 - 1),
+        period_start,
+        success=False,
+    )
+
+
+@with_all_phases
+@spec_state_test
+def test_get_eth1_vote_default_vote(spec, state):
+    min_new_period_epochs = get_min_new_period_epochs(spec)
+    for _ in range(min_new_period_epochs):
+        next_epoch(spec, state)
+
+    state.eth1_data_votes = ()
+    eth1_chain = []
+    eth1_data = spec.get_eth1_vote(state, eth1_chain)
+    assert eth1_data == state.eth1_data
+
+
+@with_all_phases
+@spec_state_test
+def test_get_eth1_vote_consensus_vote(spec, state):
+    min_new_period_epochs = get_min_new_period_epochs(spec)
+    for _ in range(min_new_period_epochs + 2):
+        next_epoch(spec, state)
+
+    period_start = spec.voting_period_start_time(state)
+    votes_length = spec.get_current_epoch(state) % spec.EPOCHS_PER_ETH1_VOTING_PERIOD
+    assert votes_length >= 3  # We need to have the majority vote
+    state.eth1_data_votes = ()
+
+    block_1 = spec.Eth1Block(timestamp=period_start - spec.SECONDS_PER_ETH1_BLOCK * spec.ETH1_FOLLOW_DISTANCE - 1)
+    block_2 = spec.Eth1Block(timestamp=period_start - spec.SECONDS_PER_ETH1_BLOCK * spec.ETH1_FOLLOW_DISTANCE)
+    eth1_chain = [block_1, block_2]
+    eth1_data_votes = []
+
+    # Only the first vote is for block_1
+    eth1_data_votes.append(spec.get_eth1_data(block_1))
+    # Other votes are for block_2
+    for _ in range(votes_length - 1):
+        eth1_data_votes.append(spec.get_eth1_data(block_2))
+
+    state.eth1_data_votes = eth1_data_votes
+    eth1_data = spec.get_eth1_vote(state, eth1_chain)
+    assert eth1_data.block_hash == block_2.hash_tree_root()
+
+
+@with_all_phases
+@spec_state_test
+def test_get_eth1_vote_tie(spec, state):
+    min_new_period_epochs = get_min_new_period_epochs(spec)
+    for _ in range(min_new_period_epochs + 1):
+        next_epoch(spec, state)
+
+    period_start = spec.voting_period_start_time(state)
+    votes_length = spec.get_current_epoch(state) % spec.EPOCHS_PER_ETH1_VOTING_PERIOD
+    assert votes_length > 0 and votes_length % 2 == 0
+
+    state.eth1_data_votes = ()
+    block_1 = spec.Eth1Block(timestamp=period_start - spec.SECONDS_PER_ETH1_BLOCK * spec.ETH1_FOLLOW_DISTANCE - 1)
+    block_2 = spec.Eth1Block(timestamp=period_start - spec.SECONDS_PER_ETH1_BLOCK * spec.ETH1_FOLLOW_DISTANCE)
+    eth1_chain = [block_1, block_2]
+    eth1_data_votes = []
+    # Half votes are for block_1, another half votes are for block_2
+    for i in range(votes_length):
+        if i % 2 == 0:
+            block = block_1
+        else:
+            block = block_2
+        eth1_data_votes.append(spec.get_eth1_data(block))
+
+    state.eth1_data_votes = eth1_data_votes
+    eth1_data = spec.get_eth1_vote(state, eth1_chain)
+
+    # Tiebreak by smallest distance -> eth1_chain[0]
+    assert eth1_data.block_hash == eth1_chain[0].hash_tree_root()
+
+
+@with_all_phases
+@spec_state_test
+def test_compute_new_state_root(spec, state):
+    pre_state = state.copy()
+    post_state = state.copy()
+    block = build_empty_block(spec, state, state.slot + 1)
+    state_root = spec.compute_new_state_root(state, block)
+
+    assert state_root != pre_state.hash_tree_root()
+    assert state == pre_state
+
+    # dumb verification
+    spec.process_slots(post_state, block.slot)
+    spec.process_block(post_state, block)
+    assert state_root == post_state.hash_tree_root()
+
+
+@with_all_phases
+@spec_state_test
+def test_get_block_signature(spec, state):
+    privkey = privkeys[0]
+    pubkey = pubkeys[0]
+    block = build_empty_block(spec, state)
+    domain = spec.get_domain(state, spec.DOMAIN_BEACON_PROPOSER, spec.compute_epoch_at_slot(block.slot))
+    run_get_signature_test(
+        spec=spec,
+        state=state,
+        obj=block,
+        domain=domain,
+        get_signature_fn=spec.get_block_signature,
+        privkey=privkey,
+        pubkey=pubkey,
+    )
+
+
+# Attesting
+
+
+@with_all_phases
+@spec_state_test
+def test_get_attestation_signature(spec, state):
+    privkey = privkeys[0]
+    pubkey = pubkeys[0]
+    attestation_data = spec.AttestationData(slot=10)
+    domain = spec.get_domain(state, spec.DOMAIN_BEACON_ATTESTER, attestation_data.target.epoch)
+    run_get_signature_test(
+        spec=spec,
+        state=state,
+        obj=attestation_data,
+        domain=domain,
+        get_signature_fn=spec.get_attestation_signature,
+        privkey=privkey,
+        pubkey=pubkey,
+    )
+
+
+# Attestation aggregation
+
+
+@with_all_phases
+@spec_state_test
+def test_get_slot_signature(spec, state):
+    privkey = privkeys[0]
+    pubkey = pubkeys[0]
+    slot = spec.Slot(10)
+    domain = spec.get_domain(state, spec.DOMAIN_SELECTION_PROOF, spec.compute_epoch_at_slot(slot))
+    run_get_signature_test(
+        spec=spec,
+        state=state,
+        obj=slot,
+        domain=domain,
+        get_signature_fn=spec.get_slot_signature,
+        privkey=privkey,
+        pubkey=pubkey,
+    )
+
+
+@with_all_phases
+@spec_state_test
+def test_is_aggregator(spec, state):
+    # TODO: we can test the probabilistic result against `TARGET_AGGREGATORS_PER_COMMITTEE`
+    #  if we have more validators and larger committeee size
+    slot = state.slot
+    committee_index = 0
+    has_aggregator = False
+    beacon_committee = spec.get_beacon_committee(state, slot, committee_index)
+    for validator_index in beacon_committee:
+        privkey = privkeys[validator_index]
+        slot_signature = spec.get_slot_signature(state, slot, privkey)
+        if spec.is_aggregator(state, slot, committee_index, slot_signature):
+            has_aggregator = True
+            break
+    assert has_aggregator
+
+
+@with_all_phases
+@spec_state_test
+def test_get_aggregate_signature(spec, state):
+    attestations = []
+    pubkeys = []
+    slot = state.slot
+    committee_index = 0
+    attestation_data = build_attestation_data(spec, state, slot=slot, index=committee_index)
+    beacon_committee = spec.get_beacon_committee(
+        state,
+        attestation_data.slot,
+        attestation_data.index,
+    )
+    committee_size = len(beacon_committee)
+    aggregation_bits = Bitlist[spec.MAX_VALIDATORS_PER_COMMITTEE](*([0] * committee_size))
+    for i, validator_index in enumerate(beacon_committee):
+        bits = aggregation_bits
+        bits[i] = True
+        attestations.append(
+            spec.Attestation(
+                data=attestation_data,
+                aggregation_bits=bits,
+            )
+        )
+        pubkeys.append(state.validators[validator_index].pubkey)
+    pubkey = bls.AggregatePKs(pubkeys)
+    signature = spec.get_aggregate_signature(attestations)
+    domain = spec.get_domain(state, spec.DOMAIN_BEACON_ATTESTER, attestation_data.target.epoch)
+    signing_root = spec.compute_signing_root(attestation_data, domain)
+    assert bls.Verify(pubkey, signing_root, signature)
+
+
+@with_all_phases
+@spec_state_test
+def test_get_aggregate_and_proof(spec, state):
+    privkey = privkeys[0]
+    aggregator_index = spec.ValidatorIndex(10)
+    aggregate = get_mock_aggregate(spec)
+    aggregate_and_proof = spec.get_aggregate_and_proof(state, aggregator_index, aggregate, privkey)
+    assert aggregate_and_proof.aggregator_index == aggregator_index
+    assert aggregate_and_proof.aggregate == aggregate
+    assert aggregate_and_proof.selection_proof == spec.get_slot_signature(state, aggregate.data.slot, privkey)
+
+
+@with_all_phases
+@spec_state_test
+def test_get_aggregate_and_proof_signature(spec, state):
+    privkey = privkeys[0]
+    pubkey = pubkeys[0]
+    aggregate = get_mock_aggregate(spec)
+    aggregate_and_proof = spec.get_aggregate_and_proof(state, spec.ValidatorIndex(1), aggregate, privkey)
+    domain = spec.get_domain(state, spec.DOMAIN_AGGREGATE_AND_PROOF, spec.compute_epoch_at_slot(aggregate.data.slot))
+    run_get_signature_test(
+        spec=spec,
+        state=state,
+        obj=aggregate_and_proof,
+        domain=domain,
+        get_signature_fn=spec.get_aggregate_and_proof_signature,
+        privkey=privkey,
+        pubkey=pubkey,
+    )
diff --git a/tests/core/pyspec/eth2spec/utils/bls.py b/tests/core/pyspec/eth2spec/utils/bls.py
--- a/tests/core/pyspec/eth2spec/utils/bls.py
+++ b/tests/core/pyspec/eth2spec/utils/bls.py
@@ -25,17 +25,32 @@ def entry(*args, **kw):
 
 @only_with_bls(alt_return=True)
 def Verify(PK, message, signature):
-    return bls.Verify(PK, message, signature)
+    try:
+        result = bls.Verify(PK, message, signature)
+    except Exception:
+        result = False
+    finally:
+        return result
 
 
 @only_with_bls(alt_return=True)
-def AggregateVerify(pairs, signature):
-    return bls.AggregateVerify(pairs, signature)
+def AggregateVerify(pubkeys, messages, signature):
+    try:
+        result = bls.AggregateVerify(pubkeys, messages, signature)
+    except Exception:
+        result = False
+    finally:
+        return result
 
 
 @only_with_bls(alt_return=True)
-def FastAggregateVerify(PKs, message, signature):
-    return bls.FastAggregateVerify(PKs, message, signature)
+def FastAggregateVerify(pubkeys, message, signature):
+    try:
+        result = bls.FastAggregateVerify(pubkeys, message, signature)
+    except Exception:
+        result = False
+    finally:
+        return result
 
 
 @only_with_bls(alt_return=STUB_SIGNATURE)
@@ -51,3 +66,13 @@ def Sign(SK, message):
 @only_with_bls(alt_return=STUB_COORDINATES)
 def signature_to_G2(signature):
     return _signature_to_G2(signature)
+
+
+@only_with_bls(alt_return=STUB_PUBKEY)
+def AggregatePKs(pubkeys):
+    return bls._AggregatePKs(pubkeys)
+
+
+@only_with_bls(alt_return=STUB_SIGNATURE)
+def SkToPk(SK):
+    return bls.SkToPk(SK)
diff --git a/tests/core/pyspec/eth2spec/utils/hash_function.py b/tests/core/pyspec/eth2spec/utils/hash_function.py
--- a/tests/core/pyspec/eth2spec/utils/hash_function.py
+++ b/tests/core/pyspec/eth2spec/utils/hash_function.py
@@ -1,28 +1,17 @@
 from hashlib import sha256
+from typing import Dict, Union
 
 ZERO_BYTES32 = b'\x00' * 32
 
 
-def _hash(x):
+def _hash(x: Union[bytes, bytearray, memoryview]) -> bytes:
     return sha256(x).digest()
 
 
-# Minimal collection of (key, value) pairs, for fast hash-retrieval, to save on repetitive computation cost.
-# Key = the hash input
-# Value = the hash output
-hash_cache = []
+hash_cache: Dict[bytes, bytes] = {}
 
 
-def add_zero_hashes_to_cache():
-    zerohashes = [(None, ZERO_BYTES32)]
-    for layer in range(1, 32):
-        k = zerohashes[layer - 1][1] + zerohashes[layer - 1][1]
-        zerohashes.append((k, _hash(k)))
-    hash_cache.extend(zerohashes[1:])
-
-
-def hash(x):
-    for (k, h) in hash_cache:
-        if x == k:
-            return h
+def hash(x: bytes) -> bytes:
+    if x in hash_cache:
+        return hash_cache[x]
     return _hash(x)
diff --git a/tests/formats/bls/README.md b/tests/formats/bls/README.md
--- a/tests/formats/bls/README.md
+++ b/tests/formats/bls/README.md
@@ -5,11 +5,10 @@ We do not recommend rolling your own crypto or using an untested BLS library.
 
 The BLS test suite runner has the following handlers:
 
-- [`aggregate_pubkeys`](./aggregate_pubkeys.md)
-- [`aggregate_sigs`](./aggregate_sigs.md)
-- [`msg_hash_g2_compressed`](./msg_hash_g2_compressed.md)
-- [`msg_hash_g2_uncompressed`](./msg_hash_g2_uncompressed.md)
-- [`priv_to_pub`](./priv_to_pub.md)
-- [`sign_msg`](./sign_msg.md)
+- [`aggregate_verify`](./aggregate_verify.md)
+- [`aggregate`](./aggregate.md)
+- [`fast_aggregate_verify`](./fast_aggregate_verify.md)
+- [`sign`](./sign.md)
+- [`verify`](./verify.md)
 
 *Note*: Signature-verification and aggregate-verify test cases are not yet supported.
diff --git a/tests/formats/bls/aggregate.md b/tests/formats/bls/aggregate.md
new file mode 100644
--- /dev/null
+++ b/tests/formats/bls/aggregate.md
@@ -0,0 +1,19 @@
+# Test format: BLS signature aggregation
+
+A BLS signature aggregation combines a series of signatures into a single signature.
+
+## Test case format
+
+The test data is declared in a `data.yaml` file:
+
+```yaml
+input: List[BLS Signature] -- list of input BLS signatures
+output: BLS Signature -- expected output, single BLS signature or empty.
+```
+
+- `BLS Signature` here is encoded as a string: hexadecimal encoding of 96 bytes (192 nibbles), prefixed with `0x`.
+- No output value if the input is invalid.
+
+## Condition
+
+The `aggregate` handler should aggregate the signatures in the `input`, and the result should match the expected `output`.
diff --git a/tests/formats/bls/aggregate_pubkeys.md b/tests/formats/bls/aggregate_pubkeys.md
deleted file mode 100644
--- a/tests/formats/bls/aggregate_pubkeys.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Test format: BLS pubkey aggregation
-
-A BLS pubkey aggregation combines a series of pubkeys into a single pubkey.
-
-## Test case format
-
-The test data is declared in a `data.yaml` file:
-
-```yaml
-input: List[BLS Pubkey] -- list of input BLS pubkeys
-output: BLS Pubkey -- expected output, single BLS pubkey
-```
-
-`BLS Pubkey` here is encoded as a string: hexadecimal encoding of 48 bytes (96 nibbles), prefixed with `0x`.
-
-
-## Condition
-
-The `aggregate_pubkeys` handler should aggregate the keys in the `input`, and the result should match the expected `output`.
diff --git a/tests/formats/bls/aggregate_sigs.md b/tests/formats/bls/aggregate_sigs.md
deleted file mode 100644
--- a/tests/formats/bls/aggregate_sigs.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Test format: BLS signature aggregation
-
-A BLS signature aggregation combines a series of signatures into a single signature.
-
-## Test case format
-
-The test data is declared in a `data.yaml` file:
-
-```yaml
-input: List[BLS Signature] -- list of input BLS signatures
-output: BLS Signature -- expected output, single BLS signature
-```
-
-`BLS Signature` here is encoded as a string: hexadecimal encoding of 96 bytes (192 nibbles), prefixed with `0x`.
-
-
-## Condition
-
-The `aggregate_sigs` handler should aggregate the signatures in the `input`, and the result should match the expected `output`.
diff --git a/tests/formats/bls/aggregate_verify.md b/tests/formats/bls/aggregate_verify.md
new file mode 100644
--- /dev/null
+++ b/tests/formats/bls/aggregate_verify.md
@@ -0,0 +1,17 @@
+# Test format: BLS sign message
+
+Verify the signature against the given pubkeys and one messages.
+
+## Test case format
+
+The test data is declared in a `data.yaml` file:
+
+```yaml
+input:
+  pubkeys: List[bytes48] -- the pubkeys
+  messages: List[bytes32] -- the messages
+  signature: bytes96 -- the signature to verify against pubkeys and messages
+output: bool  -- VALID or INVALID
+```
+
+All byte(s) fields are encoded as strings, hexadecimal encoding, prefixed with `0x`.
diff --git a/tests/formats/bls/fast_aggregate_verify.md b/tests/formats/bls/fast_aggregate_verify.md
new file mode 100644
--- /dev/null
+++ b/tests/formats/bls/fast_aggregate_verify.md
@@ -0,0 +1,17 @@
+# Test format: BLS sign message
+
+Verify the signature against the given pubkeys and one message.
+
+## Test case format
+
+The test data is declared in a `data.yaml` file:
+
+```yaml
+input:
+  pubkeys: List[bytes48] -- the pubkey
+  message: bytes32 -- the message
+  signature: bytes96 -- the signature to verify against pubkeys and message
+output: bool  -- VALID or INVALID
+```
+
+All byte(s) fields are encoded as strings, hexadecimal encoding, prefixed with `0x`.
diff --git a/tests/formats/bls/msg_hash_g2_compressed.md b/tests/formats/bls/msg_hash_g2_compressed.md
deleted file mode 100644
--- a/tests/formats/bls/msg_hash_g2_compressed.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Test format: BLS hash-compressed
-
-A BLS compressed-hash to G2.
-
-## Test case format
-
-The test data is declared in a `data.yaml` file:
-
-```yaml
-input: 
-  message: bytes32
-  domain: bytes8   -- the BLS domain
-output: List[bytes48] -- length of two
-```
-
-All byte(s) fields are encoded as strings, hexadecimal encoding, prefixed with `0x`.
-
-
-## Condition
-
-The `msg_hash_g2_compressed` handler should hash the `message`, with the given `domain`, to G2 with compression, and the result should match the expected `output`.
diff --git a/tests/formats/bls/msg_hash_g2_uncompressed.md b/tests/formats/bls/msg_hash_g2_uncompressed.md
deleted file mode 100644
--- a/tests/formats/bls/msg_hash_g2_uncompressed.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Test format: BLS hash-uncompressed
-
-A BLS uncompressed-hash to G2.
-
-## Test case format
-
-The test data is declared in a `data.yaml` file:
-
-```yaml
-input:
-  message: bytes32
-  domain: bytes8   -- the BLS domain
-output: List[List[bytes48]] -- 3 lists, each a length of two
-```
-
-All byte(s) fields are encoded as strings, hexadecimal encoding, prefixed with `0x`.
-
-
-## Condition
-
-The `msg_hash_g2_uncompressed` handler should hash the `message`, with the given `domain`, to G2, without compression, and the result should match the expected `output`.
diff --git a/tests/formats/bls/priv_to_pub.md b/tests/formats/bls/priv_to_pub.md
deleted file mode 100644
--- a/tests/formats/bls/priv_to_pub.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Test format: BLS private key to pubkey
-
-A BLS private key to public key conversion.
-
-## Test case format
-
-The test data is declared in a `data.yaml` file:
-
-```yaml
-input: bytes32 -- the private key
-output: bytes48 -- the public key
-```
-
-All byte(s) fields are encoded as strings, hexadecimal encoding, prefixed with `0x`.
-
-
-## Condition
-
-The `priv_to_pub` handler should compute the public key for the given private key `input`, and the result should match the expected `output`.
diff --git a/tests/formats/bls/sign_msg.md b/tests/formats/bls/sign.md
similarity index 67%
rename from tests/formats/bls/sign_msg.md
rename to tests/formats/bls/sign.md
--- a/tests/formats/bls/sign_msg.md
+++ b/tests/formats/bls/sign.md
@@ -10,13 +10,7 @@ The test data is declared in a `data.yaml` file:
 input:
   privkey: bytes32 -- the private key used for signing
   message: bytes32 -- input message to sign (a hash)
-  domain: bytes8   -- the BLS domain
 output: bytes96    -- expected signature
 ```
 
 All byte(s) fields are encoded as strings, hexadecimal encoding, prefixed with `0x`.
-
-
-## Condition
-
-The `sign_msg` handler should sign the given `message`, with `domain`, using the given `privkey`, and the result should match the expected `output`.
diff --git a/tests/formats/bls/verify.md b/tests/formats/bls/verify.md
new file mode 100644
--- /dev/null
+++ b/tests/formats/bls/verify.md
@@ -0,0 +1,17 @@
+# Test format: BLS sign message
+
+Verify the signature against the given one pubkey and one message.
+
+## Test case format
+
+The test data is declared in a `data.yaml` file:
+
+```yaml
+input:
+  pubkey: bytes48 -- the pubkey
+  message: bytes32 -- the message
+  signature: bytes96 -- the signature to verify against pubkey and message
+output: bool  -- VALID or INVALID
+```
+
+All byte(s) fields are encoded as strings, hexadecimal encoding, prefixed with `0x`.
diff --git a/tests/formats/epoch_processing/README.md b/tests/formats/epoch_processing/README.md
--- a/tests/formats/epoch_processing/README.md
+++ b/tests/formats/epoch_processing/README.md
@@ -38,7 +38,7 @@ The provided pre-state is already transitioned to just before the specific sub-t
 Sub-transitions:
 
 - `justification_and_finalization`
-- *`rewards_and_penalties` - planned testing extension*
+- `rewards_and_penalties` (limited to `minimal` config)
 - `registry_updates`
 - `slashings`
 - `final_updates`
diff --git a/tests/formats/rewards/README.md b/tests/formats/rewards/README.md
--- a/tests/formats/rewards/README.md
+++ b/tests/formats/rewards/README.md
@@ -1,8 +1,15 @@
 # Rewards tests
 
-The different rewards deltas sub-functions are testing individually with the test handlers, each returning the related `rewards`/`penalties`.
+All rewards deltas sub-functions are tested for each test case.
 There is no "change" factor, the rewards/penalties outputs are pure functions with just the pre-state as input.
-Hence, the format is shared between each test-handler. (See test condition documentation on how to run the tests.)
+(See test condition documentation on how to run the tests.)
+
+`Deltas` is defined as:
+```python
+class Deltas(Container):
+    rewards: List[Gwei, VALIDATOR_REGISTRY_LIMIT]
+    penalties: List[Gwei, VALIDATOR_REGISTRY_LIMIT]
+```
 
 ## Test case format
 
@@ -22,31 +29,47 @@ A YAML-encoded `BeaconState`, the state before running the rewards sub-function.
 
 Also available as `pre.ssz`.
 
-### `deltas.yaml`
+### `source_deltas.yaml`
 
-A YAML-encoded `Deltas` representing the rewards and penalties returned by the rewards sub-function
+A YAML-encoded `Deltas` representing the rewards and penalties returned by the rewards the `get_source_deltas` function
 
-Where `Deltas` is defined as:
-```python
-class Deltas(Container):
-    rewards: List[uint64, VALIDATOR_REGISTRY_LIMIT]
-    penalties: List[uint64, VALIDATOR_REGISTRY_LIMIT]
-```
+Also available as `source_deltas.ssz`.
+
+### `target_deltas.yaml`
+
+A YAML-encoded `Deltas` representing the rewards and penalties returned by the rewards the `get_target_deltas` function
+
+Also available as `target_deltas.ssz`.
+
+### `head_deltas.yaml`
+
+A YAML-encoded `Deltas` representing the rewards and penalties returned by the rewards the `get_head_deltas` function
+
+Also available as `head_deltas.ssz`.
+
+### `inclusion_delay_deltas.yaml`
+
+A YAML-encoded `Deltas` representing the rewards and penalties returned by the rewards the `get_inclusion_delay_deltas` function
+
+Also available as `inclusion_delay_deltas.ssz`.
+
+### `inactivity_penalty_deltas.yaml`
+
+A YAML-encoded `Deltas` representing the rewards and penalties returned by the rewards the `get_inactivity_penalty_deltas` function
 
-Also available as `deltas.ssz`.
+Also available as `inactivity_penalty_deltas.ssz`.
 
 ## Condition
 
 A handler of the `rewards` test-runner should process these cases, 
- calling the corresponding rewards deltas function (same name in spec).
-This excludes all other parts of `process_rewards_and_penalties`
+ calling the corresponding rewards deltas function for each set of deltas.
 
-The provided pre-state is ready to be input into the designated handler.
+The provided pre-state is ready to be input into each rewards deltas function.
 
 The provided `deltas` should match the return values of the
- handler. Specifically the following must hold true:
+ deltas function. Specifically the following must hold true for each set of deltas:
 
 ```python
-    deltas.rewards == handler(state)[0]
-    deltas.penalties == handler(state)[1]
+    deltas.rewards == deltas_function(state)[0]
+    deltas.penalties == deltas_function(state)[1]
 ```
diff --git a/tests/generators/bls/README.md b/tests/generators/bls/README.md
--- a/tests/generators/bls/README.md
+++ b/tests/generators/bls/README.md
@@ -1,21 +1,11 @@
 # BLS Test Generator
 
-Explanation of BLS12-381 type hierarchy
-The base unit is bytes48 of which only 381 bits are used
+The [BLS Signature APIs](../../../specs/phase0/beacon-chain.md#bls-signatures)
 
-- FQ: uint381 modulo field modulus
-- FQ2: (FQ, FQ)
-- G2: (FQ2, FQ2, FQ2)
+Information on the format of the tests can be found in the [BLS test formats documentation](../../formats/bls/README.md).
 
 ## Resources
 
-- [Eth2 spec](../../../specs/phase0/beacon-chain.md#bls-signatures)
+- [IETF BLS Signature Scheme](https://datatracker.ietf.org/doc/draft-irtf-cfrg-bls-signature/)
 - [Finite Field Arithmetic](http://www.springeronline.com/sgw/cda/pageitems/document/cda_downloaddocument/0,11996,0-0-45-110359-0,00.pdf)
-- Chapter 2 of [Elliptic Curve Cryptography](http://cacr.uwaterloo.ca/ecc/). Darrel Hankerson, Alfred Menezes, and Scott Vanstone 
-- [Zcash BLS parameters](https://github.com/zkcrypto/pairing/tree/master/src/bls12_381)
-- [Trinity implementation](https://github.com/ethereum/trinity/blob/master/eth2/_utils/bls.py)
-
-## Comments
-
-Compared to Zcash, Ethereum specs always requires the compressed form (c_flag / most significant bit always set).
-Also note that pubkeys and privkeys are reversed.
+- Chapter 2 of [Elliptic Curve Cryptography](http://cacr.uwaterloo.ca/ecc/). Darrel Hankerson, Alfred Menezes, and Scott Vanstone
diff --git a/tests/generators/bls/main.py b/tests/generators/bls/main.py
--- a/tests/generators/bls/main.py
+++ b/tests/generators/bls/main.py
@@ -10,20 +10,16 @@
 )
 from gen_base import gen_runner, gen_typing
 
-from py_ecc import bls
+from eth2spec.utils import bls
 from hashlib import sha256
 
 from eth2spec.test.context import PHASE0
 
+
 def hash(x):
     return sha256(x).digest()
 
 
-F2Q_COEFF_LEN = 48
-G2_COMPRESSED_Z_LEN = 48
-DST = bls.G2ProofOfPossession.DST
-
-
 def int_to_hex(n: int, byte_length: int = None) -> str:
     byte_value = int_to_big_endian(n)
     if byte_length:
@@ -49,11 +45,15 @@ def hex_to_int(x: str) -> int:
     hex_to_int('0x00000000000000000000000000000000328388aff0d4a5b7dc9205abd374e7e98f3cd9f3418edb4eafda5fb16473d216'),
 ]
 
+Z1_PUBKEY = b'\xc0' + b'\x00' * 47
+NO_SIGNATURE = b'\x00' * 96
+Z2_SIGNATURE = b'\xc0' + b'\x00' * 95
+
 
 def case01_sign():
     for privkey in PRIVKEYS:
         for message in MESSAGES:
-            sig = bls.G2ProofOfPossession.Sign(privkey, message)
+            sig = bls.Sign(privkey, message)
             identifier = f'{int_to_hex(privkey)}_{encode_hex(message)}'
             yield f'sign_case_{(hash(bytes(identifier, "utf-8"))[:8]).hex()}', {
                 'input': {
@@ -68,9 +68,10 @@ def case02_verify():
     for i, privkey in enumerate(PRIVKEYS):
         for message in MESSAGES:
             # Valid signature
-            signature = bls.G2ProofOfPossession.Sign(privkey, message)
-            pubkey = bls.G2ProofOfPossession.PrivToPub(privkey)
+            signature = bls.Sign(privkey, message)
+            pubkey = bls.SkToPk(privkey)
             identifier = f'{encode_hex(pubkey)}_{encode_hex(message)}'
+            assert bls.Verify(pubkey, message, signature)
             yield f'verify_valid_case_{(hash(bytes(identifier, "utf-8"))[:8]).hex()}', {
                 'input': {
                     'pubkey': encode_hex(pubkey),
@@ -81,8 +82,9 @@ def case02_verify():
             }
 
             # Invalid signatures -- wrong pubkey
-            wrong_pubkey = bls.G2ProofOfPossession.PrivToPub(PRIVKEYS[(i + 1) % len(PRIVKEYS)])
+            wrong_pubkey = bls.SkToPk(PRIVKEYS[(i + 1) % len(PRIVKEYS)])
             identifier = f'{encode_hex(wrong_pubkey)}_{encode_hex(message)}'
+            assert not bls.Verify(wrong_pubkey, message, signature)
             yield f'verify_wrong_pubkey_case_{(hash(bytes(identifier, "utf-8"))[:8]).hex()}', {
                 'input': {
                     'pubkey': encode_hex(wrong_pubkey),
@@ -95,6 +97,7 @@ def case02_verify():
             # Invalid signature -- tampered with signature
             tampered_signature = signature[:-4] + b'\xFF\xFF\xFF\xFF'
             identifier = f'{encode_hex(pubkey)}_{encode_hex(message)}'
+            assert not bls.Verify(pubkey, message, tampered_signature)
             yield f'verify_tampered_signature_case_{(hash(bytes(identifier, "utf-8"))[:8]).hex()}', {
                 'input': {
                     'pubkey': encode_hex(pubkey),
@@ -104,26 +107,51 @@ def case02_verify():
                 'output': False,
             }
 
+        # Valid pubkey and signature with the point at infinity
+        assert bls.Verify(Z1_PUBKEY, message, Z2_SIGNATURE)
+        yield f'verify_infinity_pubkey_and_infinity_signature', {
+            'input': {
+                'pubkey': encode_hex(Z1_PUBKEY),
+                'message': encode_hex(message),
+                'signature': encode_hex(Z2_SIGNATURE),
+            },
+            'output': True,
+        }
+
 
 def case03_aggregate():
     for message in MESSAGES:
-        sigs = [bls.G2ProofOfPossession.Sign(privkey, message) for privkey in PRIVKEYS]
+        sigs = [bls.Sign(privkey, message) for privkey in PRIVKEYS]
         yield f'aggregate_{encode_hex(message)}', {
             'input': [encode_hex(sig) for sig in sigs],
-            'output': encode_hex(bls.G2ProofOfPossession.Aggregate(sigs)),
+            'output': encode_hex(bls.Aggregate(sigs)),
         }
 
+    # Invalid pubkeys -- len(pubkeys) == 0
+    try:
+        bls.Aggregate([])
+    except Exception:
+        pass
+    else:
+        raise Exception("Should have been INVALID")
+
+    yield f'aggregate_na_pubkeys', {
+        'input': [],
+        'output': None,
+    }
+
 
 def case04_fast_aggregate_verify():
     for i, message in enumerate(MESSAGES):
         privkeys = PRIVKEYS[:i + 1]
-        sigs = [bls.G2ProofOfPossession.Sign(privkey, message) for privkey in privkeys]
-        aggregate_signature = bls.G2ProofOfPossession.Aggregate(sigs)
-        pubkeys = [bls.G2ProofOfPossession.PrivToPub(privkey) for privkey in privkeys]
+        sigs = [bls.Sign(privkey, message) for privkey in privkeys]
+        aggregate_signature = bls.Aggregate(sigs)
+        pubkeys = [bls.SkToPk(privkey) for privkey in privkeys]
         pubkeys_serial = [encode_hex(pubkey) for pubkey in pubkeys]
 
         # Valid signature
         identifier = f'{pubkeys_serial}_{encode_hex(message)}'
+        assert bls.FastAggregateVerify(pubkeys, message, aggregate_signature)
         yield f'fast_aggregate_verify_valid_{(hash(bytes(identifier, "utf-8"))[:8]).hex()}', {
             'input': {
                 'pubkeys': pubkeys_serial,
@@ -134,9 +162,10 @@ def case04_fast_aggregate_verify():
         }
 
         # Invalid signature -- extra pubkey
-        pubkeys_extra = pubkeys + [bls.G2ProofOfPossession.PrivToPub(PRIVKEYS[-1])]
+        pubkeys_extra = pubkeys + [bls.SkToPk(PRIVKEYS[-1])]
         pubkeys_extra_serial = [encode_hex(pubkey) for pubkey in pubkeys_extra]
         identifier = f'{pubkeys_extra_serial}_{encode_hex(message)}'
+        assert not bls.FastAggregateVerify(pubkeys_extra, message, aggregate_signature)
         yield f'fast_aggregate_verify_extra_pubkey_{(hash(bytes(identifier, "utf-8"))[:8]).hex()}', {
             'input': {
                 'pubkeys': pubkeys_extra_serial,
@@ -149,6 +178,7 @@ def case04_fast_aggregate_verify():
         # Invalid signature -- tampered with signature
         tampered_signature = aggregate_signature[:-4] + b'\xff\xff\xff\xff'
         identifier = f'{pubkeys_serial}_{encode_hex(message)}'
+        assert not bls.FastAggregateVerify(pubkeys, message, tampered_signature)
         yield f'fast_aggregate_verify_tampered_signature_{(hash(bytes(identifier, "utf-8"))[:8]).hex()}', {
             'input': {
                 'pubkeys': pubkeys_serial,
@@ -158,37 +188,88 @@ def case04_fast_aggregate_verify():
             'output': False,
         }
 
+    # Invalid pubkeys and signature -- len(pubkeys) == 0 and signature == Z1_SIGNATURE
+    assert not bls.FastAggregateVerify([], message, Z2_SIGNATURE)
+    yield f'fast_aggregate_verify_na_pubkeys_and_infinity_signature', {
+        'input': {
+            'pubkeys': [],
+            'message': encode_hex(message),
+            'signature': encode_hex(Z2_SIGNATURE),
+        },
+        'output': False,
+    }
+
+    # Invalid pubkeys and signature -- len(pubkeys) == 0 and signature == 0x00...
+    assert not bls.FastAggregateVerify([], message, NO_SIGNATURE)
+    yield f'fast_aggregate_verify_na_pubkeys_and_na_signature', {
+        'input': {
+            'pubkeys': [],
+            'message': encode_hex(message),
+            'signature': encode_hex(NO_SIGNATURE),
+        },
+        'output': False,
+    }
+
 
 def case05_aggregate_verify():
-    pairs = []
+    pubkeys = []
+    pubkeys_serial = []
+    messages = []
+    messages_serial = []
     sigs = []
     for privkey, message in zip(PRIVKEYS, MESSAGES):
-        sig = bls.G2ProofOfPossession.Sign(privkey, message)
-        pubkey = bls.G2ProofOfPossession.PrivToPub(privkey)
-        pairs.append({
-            'pubkey': encode_hex(pubkey),
-            'message': encode_hex(message),
-        })
+        sig = bls.Sign(privkey, message)
+        pubkey = bls.SkToPk(privkey)
+        pubkeys.append(pubkey)
+        pubkeys_serial.append(encode_hex(pubkey))
+        messages.append(message)
+        messages_serial.append(encode_hex(message))
         sigs.append(sig)
 
-    aggregate_signature = bls.G2ProofOfPossession.Aggregate(sigs)
+    aggregate_signature = bls.Aggregate(sigs)
+    assert bls.AggregateVerify(pubkeys, messages, aggregate_signature)
     yield f'aggregate_verify_valid', {
         'input': {
-            'pairs': pairs,
+            'pubkeys': pubkeys_serial,
+            'messages': messages_serial,
             'signature': encode_hex(aggregate_signature),
         },
         'output': True,
     }
 
     tampered_signature = aggregate_signature[:4] + b'\xff\xff\xff\xff'
+    assert not bls.AggregateVerify(pubkey, messages, tampered_signature)
     yield f'aggregate_verify_tampered_signature', {
         'input': {
-            'pairs': pairs,
+            'pubkeys': pubkeys_serial,
+            'messages': messages_serial,
             'signature': encode_hex(tampered_signature),
         },
         'output': False,
     }
 
+    # Invalid pubkeys and signature -- len(pubkeys) == 0 and signature == Z1_SIGNATURE
+    assert not bls.AggregateVerify([], [], Z2_SIGNATURE)
+    yield f'aggregate_verify_na_pubkeys_and_infinity_signature', {
+        'input': {
+            'pubkeys': [],
+            'messages': [],
+            'signature': encode_hex(Z2_SIGNATURE),
+        },
+        'output': False,
+    }
+
+    # Invalid pubkeys and signature -- len(pubkeys) == 0 and signature == 0x00...
+    assert not bls.AggregateVerify([], [], NO_SIGNATURE)
+    yield f'aggregate_verify_na_pubkeys_and_na_signature', {
+        'input': {
+            'pubkeys': [],
+            'messages': [],
+            'signature': encode_hex(NO_SIGNATURE),
+        },
+        'output': False,
+    }
+
 
 def create_provider(handler_name: str,
                     test_case_fn: Callable[[], Iterable[Tuple[str, Dict[str, Any]]]]) -> gen_typing.TestProvider:
diff --git a/tests/generators/bls/requirements.txt b/tests/generators/bls/requirements.txt
--- a/tests/generators/bls/requirements.txt
+++ b/tests/generators/bls/requirements.txt
@@ -1,4 +1,4 @@
-py_ecc==2.0.0
+py_ecc==4.0.0
 eth-utils==1.6.0
 ../../core/gen_helpers
 ../../../
diff --git a/tests/generators/rewards/main.py b/tests/generators/rewards/main.py
--- a/tests/generators/rewards/main.py
+++ b/tests/generators/rewards/main.py
@@ -3,11 +3,9 @@
 from eth2spec.phase0 import spec as spec_phase0
 from eth2spec.phase1 import spec as spec_phase1
 from eth2spec.test.phase_0.rewards import (
-    test_get_source_deltas,
-    test_get_target_deltas,
-    test_get_head_deltas,
-    test_get_inclusion_delay_deltas,
-    test_get_inactivity_penalty_deltas,
+    test_basic,
+    test_leak,
+    test_random,
 )
 from gen_base import gen_runner, gen_typing
 from gen_from_tests.gen import generate_from_tests
@@ -16,7 +14,7 @@
 from eth2spec.test.context import PHASE0
 
 
-def create_provider(handler_name: str, tests_src, config_name: str) -> gen_typing.TestProvider:
+def create_provider(tests_src, config_name: str) -> gen_typing.TestProvider:
 
     def prepare_fn(configs_path: str) -> str:
         config_util.prepare_config(configs_path, config_name)
@@ -27,7 +25,7 @@ def prepare_fn(configs_path: str) -> str:
     def cases_fn() -> Iterable[gen_typing.TestCase]:
         return generate_from_tests(
             runner_name='rewards',
-            handler_name=handler_name,
+            handler_name='core',
             src=tests_src,
             fork_name=PHASE0,
         )
@@ -36,15 +34,11 @@ def cases_fn() -> Iterable[gen_typing.TestCase]:
 
 
 if __name__ == "__main__":
-    gen_runner.run_generator("epoch_processing", [
-        create_provider('get_source_deltas', test_get_source_deltas, 'minimal'),
-        create_provider('get_source_deltas', test_get_source_deltas, 'mainnet'),
-        create_provider('get_target_deltas', test_get_target_deltas, 'minimal'),
-        create_provider('get_target_deltas', test_get_target_deltas, 'mainnet'),
-        create_provider('get_head_deltas', test_get_head_deltas, 'minimal'),
-        create_provider('get_head_deltas', test_get_head_deltas, 'mainnet'),
-        create_provider('get_inclusion_delay_deltas', test_get_inclusion_delay_deltas, 'minimal'),
-        create_provider('get_inclusion_delay_deltas', test_get_inclusion_delay_deltas, 'mainnet'),
-        create_provider('get_inactivity_penalty_deltas', test_get_inactivity_penalty_deltas, 'minimal'),
-        create_provider('get_inactivity_penalty_deltas', test_get_inactivity_penalty_deltas, 'mainnet'),
+    gen_runner.run_generator("rewards", [
+        create_provider(test_basic, 'minimal'),
+        create_provider(test_basic, 'mainnet'),
+        create_provider(test_leak, 'minimal'),
+        create_provider(test_leak, 'mainnet'),
+        create_provider(test_random, 'minimal'),
+        create_provider(test_random, 'mainnet'),
     ])