diff --git a/test_generators/ssz_generic/requirements.txt b/test_generators/ssz_generic/requirements.txt
index dcdb0824f..94c019c4e 100644
--- a/test_generators/ssz_generic/requirements.txt
+++ b/test_generators/ssz_generic/requirements.txt
@@ -1,4 +1,4 @@
 eth-utils==1.6.0
 ../../test_libs/gen_helpers
 ../../test_libs/config_helpers
-ssz==0.1.0a2
+ssz==0.1.3
diff --git a/test_libs/pyspec/eth2spec/fuzzing/decoder.py b/test_libs/pyspec/eth2spec/fuzzing/decoder.py
index ccca17385..272ed0c44 100644
--- a/test_libs/pyspec/eth2spec/fuzzing/decoder.py
+++ b/test_libs/pyspec/eth2spec/fuzzing/decoder.py
@@ -18,14 +18,11 @@ def translate_typ(typ) -> ssz.BaseSedes:
     elif issubclass(typ, spec_ssz.Vector):
         return ssz.Vector(translate_typ(typ.elem_type), typ.length)
     elif issubclass(typ, spec_ssz.List):
-        # TODO: Make py-ssz List support the new fixed length list
-        return ssz.List(translate_typ(typ.elem_type))
+        return ssz.List(translate_typ(typ.elem_type), typ.length)
     elif issubclass(typ, spec_ssz.Bitlist):
-        # TODO: Once Bitlist implemented in py-ssz, use appropriate type
-        return ssz.List(translate_typ(typ.elem_type))
+        return ssz.Bitlist(typ.length)
     elif issubclass(typ, spec_ssz.Bitvector):
-        # TODO: Once Bitvector implemented in py-ssz, use appropriate type
-        return ssz.Vector(translate_typ(typ.elem_type), typ.length)
+        return ssz.Bitvector(typ.length)
     elif issubclass(typ, spec_ssz.boolean):
         return ssz.boolean
     elif issubclass(typ, spec_ssz.uint):
diff --git a/test_libs/pyspec/eth2spec/fuzzing/test_decoder.py b/test_libs/pyspec/eth2spec/fuzzing/test_decoder.py
index ea1f1d47f..77b52e7a2 100644
--- a/test_libs/pyspec/eth2spec/fuzzing/test_decoder.py
+++ b/test_libs/pyspec/eth2spec/fuzzing/test_decoder.py
@@ -9,9 +9,7 @@ def test_decoder():
     rng = Random(123)
 
     # check these types only, Block covers a lot of operation types already.
-    # TODO: Once has Bitlists and Bitvectors, add back
-    #       spec.BeaconState and spec.BeaconBlock
-    for typ in [spec.IndexedAttestation, spec.AttestationDataAndCustodyBit]:
+    for typ in [spec.AttestationDataAndCustodyBit, spec.BeaconState, spec.BeaconBlock]:
         # create a random pyspec value
         original = random_value.get_random_ssz_object(rng, typ, 100, 10,
                                                       mode=random_value.RandomizationMode.mode_random,
@@ -32,4 +30,6 @@ def test_decoder():
         block = translate_value(raw_value, typ)
 
         # and see if the hash-tree-root of the original matches the hash-tree-root of the decoded & translated value.
-        assert spec_ssz_impl.hash_tree_root(original) == spec_ssz_impl.hash_tree_root(block)
+        original_hash_tree_root = spec_ssz_impl.hash_tree_root(original)
+        assert original_hash_tree_root == spec_ssz_impl.hash_tree_root(block)
+        assert original_hash_tree_root == block_sedes.get_hash_tree_root(raw_value)
diff --git a/test_libs/pyspec/requirements.txt b/test_libs/pyspec/requirements.txt
index 713b4331a..480602779 100644
--- a/test_libs/pyspec/requirements.txt
+++ b/test_libs/pyspec/requirements.txt
@@ -3,4 +3,4 @@ eth-typing>=2.1.0,<3.0.0
 pycryptodome==3.7.3
 py_ecc==1.7.1
 dataclasses==0.6
-ssz==0.1.0a10
+ssz==0.1.3
diff --git a/test_libs/pyspec/setup.py b/test_libs/pyspec/setup.py
index 07e538e80..94575f2a1 100644
--- a/test_libs/pyspec/setup.py
+++ b/test_libs/pyspec/setup.py
@@ -9,7 +9,7 @@ setup(
         "eth-typing>=2.1.0,<3.0.0",
         "pycryptodome==3.7.3",
         "py_ecc==1.7.1",
-        "ssz==0.1.0a10",
+        "ssz==0.1.3",
         "dataclasses==0.6",
     ]
 )