Remove templates testdata.
These are now unused.
PiperOrigin-RevId: 395461951
diff --git a/python/tink/aead/BUILD.bazel b/python/tink/aead/BUILD.bazel
index a149ac8..b39ded6 100644
--- a/python/tink/aead/BUILD.bazel
+++ b/python/tink/aead/BUILD.bazel
@@ -101,9 +101,6 @@
py_test(
name = "_aead_key_templates_test",
srcs = ["_aead_key_templates_test.py"],
- data = [
- "@tink_base//testdata/templates",
- ],
srcs_version = "PY3",
deps = [
":aead",
diff --git a/python/tink/daead/BUILD.bazel b/python/tink/daead/BUILD.bazel
index 24dab0c..3c15da8 100644
--- a/python/tink/daead/BUILD.bazel
+++ b/python/tink/daead/BUILD.bazel
@@ -64,9 +64,6 @@
py_test(
name = "_deterministic_aead_key_templates_test",
srcs = ["_deterministic_aead_key_templates_test.py"],
- data = [
- "@tink_base//testdata/templates",
- ],
srcs_version = "PY3",
deps = [
":daead",
diff --git a/python/tink/hybrid/BUILD.bazel b/python/tink/hybrid/BUILD.bazel
index b192213..c598ea4 100644
--- a/python/tink/hybrid/BUILD.bazel
+++ b/python/tink/hybrid/BUILD.bazel
@@ -103,9 +103,6 @@
py_test(
name = "_hybrid_key_templates_test",
srcs = ["_hybrid_key_templates_test.py"],
- data = [
- "@tink_base//testdata/templates",
- ],
srcs_version = "PY3",
deps = [
":hybrid",
diff --git a/python/tink/jwt/BUILD.bazel b/python/tink/jwt/BUILD.bazel
index d598427..3e7abc7 100644
--- a/python/tink/jwt/BUILD.bazel
+++ b/python/tink/jwt/BUILD.bazel
@@ -105,9 +105,6 @@
py_test(
name = "_jwt_key_templates_test",
srcs = ["_jwt_key_templates_test.py"],
- data = [
- "@tink_base//testdata/templates",
- ],
srcs_version = "PY3",
deps = [
":jwt",
diff --git a/python/tink/mac/BUILD.bazel b/python/tink/mac/BUILD.bazel
index 6e5dae3..fd90627 100644
--- a/python/tink/mac/BUILD.bazel
+++ b/python/tink/mac/BUILD.bazel
@@ -92,9 +92,6 @@
py_test(
name = "_mac_key_templates_test",
srcs = ["_mac_key_templates_test.py"],
- data = [
- "@tink_base//testdata/templates",
- ],
srcs_version = "PY3",
deps = [
":mac",
diff --git a/python/tink/prf/BUILD.bazel b/python/tink/prf/BUILD.bazel
index 798bbd9..b7e655c 100644
--- a/python/tink/prf/BUILD.bazel
+++ b/python/tink/prf/BUILD.bazel
@@ -39,9 +39,6 @@
py_test(
name = "_prf_key_manager_test",
srcs = ["_prf_key_manager_test.py"],
- data = [
- "@tink_base//testdata/templates",
- ],
srcs_version = "PY3",
deps = [
":prf",
diff --git a/python/tink/prf/_prf_key_manager_test.py b/python/tink/prf/_prf_key_manager_test.py
index 07f79dc..904411a 100644
--- a/python/tink/prf/_prf_key_manager_test.py
+++ b/python/tink/prf/_prf_key_manager_test.py
@@ -26,7 +26,6 @@
import tink
from tink import core
from tink import prf
-from tink.testing import helper
def setUpModule():
@@ -35,16 +34,6 @@
class PrfKeyManagerTest(parameterized.TestCase):
- @parameterized.parameters([
- ('AES_CMAC_PRF', prf.prf_key_templates.AES_CMAC),
- ('HMAC_SHA256_PRF', prf.prf_key_templates.HMAC_SHA256),
- ('HMAC_SHA512_PRF', prf.prf_key_templates.HMAC_SHA512),
- ('HKDF_SHA256', prf.prf_key_templates.HKDF_SHA256)
- ])
- def test_template(self, template_name, template):
- self.assertEqual(template,
- helper.template_from_testdata(template_name, 'prf'))
-
def test_new_key_data_success(self):
key_template = prf.prf_key_templates._create_hmac_key_template(
key_size=32, hash_type=common_pb2.SHA256)
diff --git a/python/tink/signature/BUILD.bazel b/python/tink/signature/BUILD.bazel
index 385db19..06aed71 100644
--- a/python/tink/signature/BUILD.bazel
+++ b/python/tink/signature/BUILD.bazel
@@ -102,9 +102,6 @@
py_test(
name = "_signature_key_templates_test",
srcs = ["_signature_key_templates_test.py"],
- data = [
- "@tink_base//testdata/templates",
- ],
srcs_version = "PY3",
deps = [
":signature",
diff --git a/python/tink/streaming_aead/BUILD.bazel b/python/tink/streaming_aead/BUILD.bazel
index d41b875..e9cf371 100644
--- a/python/tink/streaming_aead/BUILD.bazel
+++ b/python/tink/streaming_aead/BUILD.bazel
@@ -129,9 +129,6 @@
name = "_streaming_aead_key_templates_test",
timeout = "short",
srcs = ["_streaming_aead_key_templates_test.py"],
- data = [
- "@tink_base//testdata/templates",
- ],
srcs_version = "PY3",
deps = [
":streaming_aead",
diff --git a/python/tink/testing/BUILD.bazel b/python/tink/testing/BUILD.bazel
index c0bba65..7403380 100644
--- a/python/tink/testing/BUILD.bazel
+++ b/python/tink/testing/BUILD.bazel
@@ -26,7 +26,6 @@
srcs = ["helper_test.py"],
data = [
"@tink_base//testdata:credentials",
- "@tink_base//testdata/templates",
],
srcs_version = "PY3",
deps = [
diff --git a/python/tink/testing/helper.py b/python/tink/testing/helper.py
index d518d57..b6bf424 100644
--- a/python/tink/testing/helper.py
+++ b/python/tink/testing/helper.py
@@ -20,7 +20,7 @@
from __future__ import print_function
import os
-from typing import Text, Mapping, Optional
+from typing import Text, Mapping
from tink.proto import tink_pb2
from tink import aead
@@ -30,7 +30,6 @@
from tink import mac
from tink import prf
from tink import signature as pk_signature
-from google.protobuf import text_format
def tink_root_path() -> Text:
@@ -56,20 +55,6 @@
'TINK_SRC_PATH is set.')
-def template_from_testdata(
- template_name: Text,
- dir_name: Optional[Text] = None) -> tink_pb2.KeyTemplate:
- """Reads a template from the testdata."""
- if dir_name:
- path = os.path.join(tink_root_path(), 'testdata/templates', dir_name,
- template_name)
- else:
- path = os.path.join(tink_root_path(), 'testdata/templates', template_name)
- with open(path, mode='rt') as f:
- data = f.read()
- return text_format.Parse(data, tink_pb2.KeyTemplate())
-
-
def fake_key(value: bytes = b'fakevalue',
type_url: Text = 'fakeurl',
key_material_type: tink_pb2.KeyData.KeyMaterialType = tink_pb2
diff --git a/python/tink/testing/helper_test.py b/python/tink/testing/helper_test.py
index 7b958d6..94f72c6 100644
--- a/python/tink/testing/helper_test.py
+++ b/python/tink/testing/helper_test.py
@@ -33,11 +33,6 @@
credential_json = f.read()
self.assertNotEmpty(credential_json)
- def test_template_from_testdata(self):
- template = helper.template_from_testdata('AES128_GCM', 'aead')
- self.assertEqual(template.type_url,
- 'type.googleapis.com/google.crypto.tink.AesGcmKey')
-
def test_fake_mac_success(self):
mac = helper.FakeMac('Name')
mac_value = mac.compute_mac(b'data')
diff --git a/testdata/templates/BUILD.bazel b/testdata/templates/BUILD.bazel
deleted file mode 100644
index f79a73d..0000000
--- a/testdata/templates/BUILD.bazel
+++ /dev/null
@@ -1,14 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-filegroup(
- name = "templates",
- testonly = 1,
- srcs = glob(
- [
- "*",
- "*/*",
- ],
- ),
-)
diff --git a/testdata/templates/aead/AES128_CTR_HMAC_SHA256 b/testdata/templates/aead/AES128_CTR_HMAC_SHA256
deleted file mode 100644
index c708ba3..0000000
--- a/testdata/templates/aead/AES128_CTR_HMAC_SHA256
+++ /dev/null
@@ -1,19 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.AesCtrHmacAeadKey"
-# value: [type.googleapis.com/google.crypto.tink.AesCtrHmacAeadKeyFormat] {
-# aes_ctr_key_format {
-# params {
-# iv_size: 16
-# }
-# key_size: 16
-# }
-# hmac_key_format {
-# params {
-# hash: SHA256
-# tag_size: 16
-# }
-# key_size: 32
-# version: 0
-# }
-# }
-value: "\n\006\n\002\010\020\020\020\022\010\n\004\010\003\020\020\020 "
-output_prefix_type: TINK
diff --git a/testdata/templates/aead/AES128_EAX b/testdata/templates/aead/AES128_EAX
deleted file mode 100644
index 08d4402..0000000
--- a/testdata/templates/aead/AES128_EAX
+++ /dev/null
@@ -1,9 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.AesEaxKey"
-# value: [type.googleapis.com/google.crypto.tink.AesEaxKeyFormat] {
-# params {
-# iv_size: 16
-# }
-# key_size: 16
-# }
-value: "\n\002\010\020\020\020"
-output_prefix_type: TINK
diff --git a/testdata/templates/aead/AES128_GCM b/testdata/templates/aead/AES128_GCM
deleted file mode 100644
index bdbf469..0000000
--- a/testdata/templates/aead/AES128_GCM
+++ /dev/null
@@ -1,7 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.AesGcmKey"
-# value: [type.googleapis.com/google.crypto.tink.AesGcmKeyFormat] {
-# key_size: 16
-# version: 0
-# }
-value: "\020\020"
-output_prefix_type: TINK
diff --git a/testdata/templates/aead/AES128_GCM_SIV b/testdata/templates/aead/AES128_GCM_SIV
deleted file mode 100644
index 6e1d0ce..0000000
--- a/testdata/templates/aead/AES128_GCM_SIV
+++ /dev/null
@@ -1,7 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.AesGcmSivKey"
-# value: [type.googleapis.com/google.crypto.tink.AesGcmSivKeyFormat] {
-# key_size: 16
-# version: 0
-# }
-value: "\020\020"
-output_prefix_type: TINK
diff --git a/testdata/templates/aead/AES256_CTR_HMAC_SHA256 b/testdata/templates/aead/AES256_CTR_HMAC_SHA256
deleted file mode 100644
index aaa68e5..0000000
--- a/testdata/templates/aead/AES256_CTR_HMAC_SHA256
+++ /dev/null
@@ -1,19 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.AesCtrHmacAeadKey"
-# value: [type.googleapis.com/google.crypto.tink.AesCtrHmacAeadKeyFormat] {
-# aes_ctr_key_format {
-# params {
-# iv_size: 16
-# }
-# key_size: 32
-# }
-# hmac_key_format {
-# params {
-# hash: SHA256
-# tag_size: 32
-# }
-# key_size: 32
-# version: 0
-# }
-# }
-value: "\n\006\n\002\010\020\020 \022\010\n\004\010\003\020 \020 "
-output_prefix_type: TINK
diff --git a/testdata/templates/aead/AES256_EAX b/testdata/templates/aead/AES256_EAX
deleted file mode 100644
index 6859cc0..0000000
--- a/testdata/templates/aead/AES256_EAX
+++ /dev/null
@@ -1,9 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.AesEaxKey"
-# value: [type.googleapis.com/google.crypto.tink.AesEaxKeyFormat] {
-# params {
-# iv_size: 16
-# }
-# key_size: 32
-# }
-value: "\n\002\010\020\020 "
-output_prefix_type: TINK
diff --git a/testdata/templates/aead/AES256_GCM b/testdata/templates/aead/AES256_GCM
deleted file mode 100644
index 8e8a204..0000000
--- a/testdata/templates/aead/AES256_GCM
+++ /dev/null
@@ -1,7 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.AesGcmKey"
-# value: [type.googleapis.com/google.crypto.tink.AesGcmKeyFormat] {
-# key_size: 32
-# version: 0
-# }
-value: "\020 "
-output_prefix_type: TINK
diff --git a/testdata/templates/aead/AES256_GCM_SIV b/testdata/templates/aead/AES256_GCM_SIV
deleted file mode 100644
index fea311f..0000000
--- a/testdata/templates/aead/AES256_GCM_SIV
+++ /dev/null
@@ -1,7 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.AesGcmSivKey"
-# value: [type.googleapis.com/google.crypto.tink.AesGcmSivKeyFormat] {
-# key_size: 32
-# version: 0
-# }
-value: "\020 "
-output_prefix_type: TINK
diff --git a/testdata/templates/aead/CHACHA20_POLY1305 b/testdata/templates/aead/CHACHA20_POLY1305
deleted file mode 100644
index e74e9bd..0000000
--- a/testdata/templates/aead/CHACHA20_POLY1305
+++ /dev/null
@@ -1,2 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.ChaCha20Poly1305Key"
-output_prefix_type: TINK
diff --git a/testdata/templates/aead/XCHACHA20_POLY1305 b/testdata/templates/aead/XCHACHA20_POLY1305
deleted file mode 100644
index 8d773e9..0000000
--- a/testdata/templates/aead/XCHACHA20_POLY1305
+++ /dev/null
@@ -1,2 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.XChaCha20Poly1305Key"
-output_prefix_type: TINK
diff --git a/testdata/templates/daead/AES256_SIV b/testdata/templates/daead/AES256_SIV
deleted file mode 100644
index be381b9..0000000
--- a/testdata/templates/daead/AES256_SIV
+++ /dev/null
@@ -1,7 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.AesSivKey"
-# value: [type.googleapis.com/google.crypto.tink.AesSivKeyFormat] {
-# key_size: 64
-# version: 0
-# }
-value: "\010@"
-output_prefix_type: TINK
diff --git a/testdata/templates/hybrid/ECIES_P256_COMPRESSED_HKDF_HMAC_SHA256_AES128_CTR_HMAC_SHA256 b/testdata/templates/hybrid/ECIES_P256_COMPRESSED_HKDF_HMAC_SHA256_AES128_CTR_HMAC_SHA256
deleted file mode 100644
index 381e11f..0000000
--- a/testdata/templates/hybrid/ECIES_P256_COMPRESSED_HKDF_HMAC_SHA256_AES128_CTR_HMAC_SHA256
+++ /dev/null
@@ -1,36 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.EciesAeadHkdfPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.EciesAeadHkdfKeyFormat] {
-# params {
-# kem_params {
-# curve_type: NIST_P256
-# hkdf_hash_type: SHA256
-# hkdf_salt: ""
-# }
-# dem_params {
-# aead_dem {
-# type_url: "type.googleapis.com/google.crypto.tink.AesCtrHmacAeadKey"
-# # value: [type.googleapis.com/google.crypto.tink.AesCtrHmacAeadKeyFormat] {
-# # aes_ctr_key_format {
-# # params {
-# # iv_size: 16
-# # }
-# # key_size: 16
-# # }
-# # hmac_key_format {
-# # params {
-# # hash: SHA256
-# # tag_size: 16
-# # }
-# # key_size: 32
-# # version: 0
-# # }
-# # }
-# value: "\n\006\n\002\010\020\020\020\022\010\n\004\010\003\020\020\020 "
-# output_prefix_type: TINK
-# }
-# }
-# ec_point_format: COMPRESSED
-# }
-# }
-value: "\n\\\n\004\010\002\020\003\022R\022P\n8type.googleapis.com/google.crypto.tink.AesCtrHmacAeadKey\022\022\n\006\n\002\010\020\020\020\022\010\n\004\010\003\020\020\020 \030\001\030\002"
-output_prefix_type: TINK
diff --git a/testdata/templates/hybrid/ECIES_P256_COMPRESSED_HKDF_HMAC_SHA256_AES128_GCM b/testdata/templates/hybrid/ECIES_P256_COMPRESSED_HKDF_HMAC_SHA256_AES128_GCM
deleted file mode 100644
index 2dd3927..0000000
--- a/testdata/templates/hybrid/ECIES_P256_COMPRESSED_HKDF_HMAC_SHA256_AES128_GCM
+++ /dev/null
@@ -1,24 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.EciesAeadHkdfPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.EciesAeadHkdfKeyFormat] {
-# params {
-# kem_params {
-# curve_type: NIST_P256
-# hkdf_hash_type: SHA256
-# hkdf_salt: ""
-# }
-# dem_params {
-# aead_dem {
-# type_url: "type.googleapis.com/google.crypto.tink.AesGcmKey"
-# # value: [type.googleapis.com/google.crypto.tink.AesGcmKeyFormat] {
-# # key_size: 16
-# # version: 0
-# # }
-# value: "\020\020"
-# output_prefix_type: TINK
-# }
-# }
-# ec_point_format: COMPRESSED
-# }
-# }
-value: "\nD\n\004\010\002\020\003\022:\0228\n0type.googleapis.com/google.crypto.tink.AesGcmKey\022\002\020\020\030\001\030\002"
-output_prefix_type: TINK
diff --git a/testdata/templates/hybrid/ECIES_P256_HKDF_HMAC_SHA256_AES128_CTR_HMAC_SHA256 b/testdata/templates/hybrid/ECIES_P256_HKDF_HMAC_SHA256_AES128_CTR_HMAC_SHA256
deleted file mode 100644
index e3ae0e9..0000000
--- a/testdata/templates/hybrid/ECIES_P256_HKDF_HMAC_SHA256_AES128_CTR_HMAC_SHA256
+++ /dev/null
@@ -1,36 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.EciesAeadHkdfPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.EciesAeadHkdfKeyFormat] {
-# params {
-# kem_params {
-# curve_type: NIST_P256
-# hkdf_hash_type: SHA256
-# hkdf_salt: ""
-# }
-# dem_params {
-# aead_dem {
-# type_url: "type.googleapis.com/google.crypto.tink.AesCtrHmacAeadKey"
-# # value: [type.googleapis.com/google.crypto.tink.AesCtrHmacAeadKeyFormat] {
-# # aes_ctr_key_format {
-# # params {
-# # iv_size: 16
-# # }
-# # key_size: 16
-# # }
-# # hmac_key_format {
-# # params {
-# # hash: SHA256
-# # tag_size: 16
-# # }
-# # key_size: 32
-# # version: 0
-# # }
-# # }
-# value: "\n\006\n\002\010\020\020\020\022\010\n\004\010\003\020\020\020 "
-# output_prefix_type: TINK
-# }
-# }
-# ec_point_format: UNCOMPRESSED
-# }
-# }
-value: "\n\\\n\004\010\002\020\003\022R\022P\n8type.googleapis.com/google.crypto.tink.AesCtrHmacAeadKey\022\022\n\006\n\002\010\020\020\020\022\010\n\004\010\003\020\020\020 \030\001\030\001"
-output_prefix_type: TINK
diff --git a/testdata/templates/hybrid/ECIES_P256_HKDF_HMAC_SHA256_AES128_GCM b/testdata/templates/hybrid/ECIES_P256_HKDF_HMAC_SHA256_AES128_GCM
deleted file mode 100644
index 71104ba..0000000
--- a/testdata/templates/hybrid/ECIES_P256_HKDF_HMAC_SHA256_AES128_GCM
+++ /dev/null
@@ -1,24 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.EciesAeadHkdfPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.EciesAeadHkdfKeyFormat] {
-# params {
-# kem_params {
-# curve_type: NIST_P256
-# hkdf_hash_type: SHA256
-# hkdf_salt: ""
-# }
-# dem_params {
-# aead_dem {
-# type_url: "type.googleapis.com/google.crypto.tink.AesGcmKey"
-# # value: [type.googleapis.com/google.crypto.tink.AesGcmKeyFormat] {
-# # key_size: 16
-# # version: 0
-# # }
-# value: "\020\020"
-# output_prefix_type: TINK
-# }
-# }
-# ec_point_format: UNCOMPRESSED
-# }
-# }
-value: "\nD\n\004\010\002\020\003\022:\0228\n0type.googleapis.com/google.crypto.tink.AesGcmKey\022\002\020\020\030\001\030\001"
-output_prefix_type: TINK
diff --git a/testdata/templates/jwt/JWT_ES256 b/testdata/templates/jwt/JWT_ES256
deleted file mode 100644
index d33927c..0000000
--- a/testdata/templates/jwt/JWT_ES256
+++ /dev/null
@@ -1,7 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtEcdsaPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtEcdsaKeyFormat] {
-# version: 0
-# algorithm: ES256
-# }
-value: "\020\001"
-output_prefix_type: TINK
diff --git a/testdata/templates/jwt/JWT_ES256_RAW b/testdata/templates/jwt/JWT_ES256_RAW
deleted file mode 100644
index 393d67b..0000000
--- a/testdata/templates/jwt/JWT_ES256_RAW
+++ /dev/null
@@ -1,7 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtEcdsaPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtEcdsaKeyFormat] {
-# version: 0
-# algorithm: ES256
-# }
-value: "\020\001"
-output_prefix_type: RAW
diff --git a/testdata/templates/jwt/JWT_ES384 b/testdata/templates/jwt/JWT_ES384
deleted file mode 100644
index 18172dc..0000000
--- a/testdata/templates/jwt/JWT_ES384
+++ /dev/null
@@ -1,7 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtEcdsaPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtEcdsaKeyFormat] {
-# version: 0
-# algorithm: ES384
-# }
-value: "\020\002"
-output_prefix_type: TINK
diff --git a/testdata/templates/jwt/JWT_ES384_RAW b/testdata/templates/jwt/JWT_ES384_RAW
deleted file mode 100644
index 3eddfe7..0000000
--- a/testdata/templates/jwt/JWT_ES384_RAW
+++ /dev/null
@@ -1,7 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtEcdsaPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtEcdsaKeyFormat] {
-# version: 0
-# algorithm: ES384
-# }
-value: "\020\002"
-output_prefix_type: RAW
diff --git a/testdata/templates/jwt/JWT_ES512 b/testdata/templates/jwt/JWT_ES512
deleted file mode 100644
index 99d1556..0000000
--- a/testdata/templates/jwt/JWT_ES512
+++ /dev/null
@@ -1,7 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtEcdsaPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtEcdsaKeyFormat] {
-# version: 0
-# algorithm: ES512
-# }
-value: "\020\003"
-output_prefix_type: TINK
diff --git a/testdata/templates/jwt/JWT_ES512_RAW b/testdata/templates/jwt/JWT_ES512_RAW
deleted file mode 100644
index 3a9b4be..0000000
--- a/testdata/templates/jwt/JWT_ES512_RAW
+++ /dev/null
@@ -1,7 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtEcdsaPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtEcdsaKeyFormat] {
-# version: 0
-# algorithm: ES512
-# }
-value: "\020\003"
-output_prefix_type: RAW
diff --git a/testdata/templates/jwt/JWT_HS256 b/testdata/templates/jwt/JWT_HS256
deleted file mode 100644
index f433f29..0000000
--- a/testdata/templates/jwt/JWT_HS256
+++ /dev/null
@@ -1,8 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtHmacKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtHmacKeyFormat] {
-# version: 0
-# algorithm: HS256
-# key_size: 32
-# }
-value: "\020\001\030 "
-output_prefix_type: TINK
diff --git a/testdata/templates/jwt/JWT_HS256_RAW b/testdata/templates/jwt/JWT_HS256_RAW
deleted file mode 100644
index 66c5cec..0000000
--- a/testdata/templates/jwt/JWT_HS256_RAW
+++ /dev/null
@@ -1,8 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtHmacKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtHmacKeyFormat] {
-# version: 0
-# algorithm: HS256
-# key_size: 32
-# }
-value: "\020\001\030 "
-output_prefix_type: RAW
diff --git a/testdata/templates/jwt/JWT_HS384 b/testdata/templates/jwt/JWT_HS384
deleted file mode 100644
index 04a29e2..0000000
--- a/testdata/templates/jwt/JWT_HS384
+++ /dev/null
@@ -1,8 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtHmacKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtHmacKeyFormat] {
-# version: 0
-# algorithm: HS384
-# key_size: 48
-# }
-value: "\020\002\0300"
-output_prefix_type: TINK
diff --git a/testdata/templates/jwt/JWT_HS384_RAW b/testdata/templates/jwt/JWT_HS384_RAW
deleted file mode 100644
index 9a19068..0000000
--- a/testdata/templates/jwt/JWT_HS384_RAW
+++ /dev/null
@@ -1,8 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtHmacKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtHmacKeyFormat] {
-# version: 0
-# algorithm: HS384
-# key_size: 48
-# }
-value: "\020\002\0300"
-output_prefix_type: RAW
diff --git a/testdata/templates/jwt/JWT_HS512 b/testdata/templates/jwt/JWT_HS512
deleted file mode 100644
index 521ec53..0000000
--- a/testdata/templates/jwt/JWT_HS512
+++ /dev/null
@@ -1,8 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtHmacKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtHmacKeyFormat] {
-# version: 0
-# algorithm: HS512
-# key_size: 64
-# }
-value: "\020\003\030@"
-output_prefix_type: TINK
diff --git a/testdata/templates/jwt/JWT_HS512_RAW b/testdata/templates/jwt/JWT_HS512_RAW
deleted file mode 100644
index c0fd312..0000000
--- a/testdata/templates/jwt/JWT_HS512_RAW
+++ /dev/null
@@ -1,8 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtHmacKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtHmacKeyFormat] {
-# version: 0
-# algorithm: HS512
-# key_size: 64
-# }
-value: "\020\003\030@"
-output_prefix_type: RAW
diff --git a/testdata/templates/jwt/JWT_PS256_2048_F4 b/testdata/templates/jwt/JWT_PS256_2048_F4
deleted file mode 100644
index 09ce895..0000000
--- a/testdata/templates/jwt/JWT_PS256_2048_F4
+++ /dev/null
@@ -1,9 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtRsaSsaPssPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtRsaSsaPssKeyFormat] {
-# version: 0
-# algorithm: PS256
-# modulus_size_in_bits: 2048
-# public_exponent: "\001\000\001"
-# }
-value: "\020\001\030\200\020\"\003\001\000\001"
-output_prefix_type: TINK
diff --git a/testdata/templates/jwt/JWT_PS256_2048_F4_RAW b/testdata/templates/jwt/JWT_PS256_2048_F4_RAW
deleted file mode 100644
index 7aa5aaf..0000000
--- a/testdata/templates/jwt/JWT_PS256_2048_F4_RAW
+++ /dev/null
@@ -1,9 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtRsaSsaPssPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtRsaSsaPssKeyFormat] {
-# version: 0
-# algorithm: PS256
-# modulus_size_in_bits: 2048
-# public_exponent: "\001\000\001"
-# }
-value: "\020\001\030\200\020\"\003\001\000\001"
-output_prefix_type: RAW
diff --git a/testdata/templates/jwt/JWT_PS256_3072_F4 b/testdata/templates/jwt/JWT_PS256_3072_F4
deleted file mode 100644
index 6373d15..0000000
--- a/testdata/templates/jwt/JWT_PS256_3072_F4
+++ /dev/null
@@ -1,9 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtRsaSsaPssPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtRsaSsaPssKeyFormat] {
-# version: 0
-# algorithm: PS256
-# modulus_size_in_bits: 3072
-# public_exponent: "\001\000\001"
-# }
-value: "\020\001\030\200\030\"\003\001\000\001"
-output_prefix_type: TINK
diff --git a/testdata/templates/jwt/JWT_PS256_3072_F4_RAW b/testdata/templates/jwt/JWT_PS256_3072_F4_RAW
deleted file mode 100644
index 64de73f..0000000
--- a/testdata/templates/jwt/JWT_PS256_3072_F4_RAW
+++ /dev/null
@@ -1,9 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtRsaSsaPssPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtRsaSsaPssKeyFormat] {
-# version: 0
-# algorithm: PS256
-# modulus_size_in_bits: 3072
-# public_exponent: "\001\000\001"
-# }
-value: "\020\001\030\200\030\"\003\001\000\001"
-output_prefix_type: RAW
diff --git a/testdata/templates/jwt/JWT_PS384_3072_F4 b/testdata/templates/jwt/JWT_PS384_3072_F4
deleted file mode 100644
index 07f0a0b..0000000
--- a/testdata/templates/jwt/JWT_PS384_3072_F4
+++ /dev/null
@@ -1,9 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtRsaSsaPssPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtRsaSsaPssKeyFormat] {
-# version: 0
-# algorithm: PS384
-# modulus_size_in_bits: 3072
-# public_exponent: "\001\000\001"
-# }
-value: "\020\002\030\200\030\"\003\001\000\001"
-output_prefix_type: TINK
diff --git a/testdata/templates/jwt/JWT_PS384_3072_F4_RAW b/testdata/templates/jwt/JWT_PS384_3072_F4_RAW
deleted file mode 100644
index dc7ae2b..0000000
--- a/testdata/templates/jwt/JWT_PS384_3072_F4_RAW
+++ /dev/null
@@ -1,9 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtRsaSsaPssPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtRsaSsaPssKeyFormat] {
-# version: 0
-# algorithm: PS384
-# modulus_size_in_bits: 3072
-# public_exponent: "\001\000\001"
-# }
-value: "\020\002\030\200\030\"\003\001\000\001"
-output_prefix_type: RAW
diff --git a/testdata/templates/jwt/JWT_PS512_4096_F4 b/testdata/templates/jwt/JWT_PS512_4096_F4
deleted file mode 100644
index 0d947c2..0000000
--- a/testdata/templates/jwt/JWT_PS512_4096_F4
+++ /dev/null
@@ -1,9 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtRsaSsaPssPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtRsaSsaPssKeyFormat] {
-# version: 0
-# algorithm: PS512
-# modulus_size_in_bits: 4096
-# public_exponent: "\001\000\001"
-# }
-value: "\020\003\030\200 \"\003\001\000\001"
-output_prefix_type: TINK
diff --git a/testdata/templates/jwt/JWT_PS512_4096_F4_RAW b/testdata/templates/jwt/JWT_PS512_4096_F4_RAW
deleted file mode 100644
index 3279796..0000000
--- a/testdata/templates/jwt/JWT_PS512_4096_F4_RAW
+++ /dev/null
@@ -1,9 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtRsaSsaPssPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtRsaSsaPssKeyFormat] {
-# version: 0
-# algorithm: PS512
-# modulus_size_in_bits: 4096
-# public_exponent: "\001\000\001"
-# }
-value: "\020\003\030\200 \"\003\001\000\001"
-output_prefix_type: RAW
diff --git a/testdata/templates/jwt/JWT_RS256_2048_F4 b/testdata/templates/jwt/JWT_RS256_2048_F4
deleted file mode 100644
index 87ff744..0000000
--- a/testdata/templates/jwt/JWT_RS256_2048_F4
+++ /dev/null
@@ -1,9 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtRsaSsaPkcs1PrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtRsaSsaPkcs1KeyFormat] {
-# version: 0
-# algorithm: RS256
-# modulus_size_in_bits: 2048
-# public_exponent: "\001\000\001"
-# }
-value: "\020\001\030\200\020\"\003\001\000\001"
-output_prefix_type: TINK
diff --git a/testdata/templates/jwt/JWT_RS256_2048_F4_RAW b/testdata/templates/jwt/JWT_RS256_2048_F4_RAW
deleted file mode 100644
index fde246d..0000000
--- a/testdata/templates/jwt/JWT_RS256_2048_F4_RAW
+++ /dev/null
@@ -1,9 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtRsaSsaPkcs1PrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtRsaSsaPkcs1KeyFormat] {
-# version: 0
-# algorithm: RS256
-# modulus_size_in_bits: 2048
-# public_exponent: "\001\000\001"
-# }
-value: "\020\001\030\200\020\"\003\001\000\001"
-output_prefix_type: RAW
diff --git a/testdata/templates/jwt/JWT_RS256_3072_F4 b/testdata/templates/jwt/JWT_RS256_3072_F4
deleted file mode 100644
index 5177f31..0000000
--- a/testdata/templates/jwt/JWT_RS256_3072_F4
+++ /dev/null
@@ -1,9 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtRsaSsaPkcs1PrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtRsaSsaPkcs1KeyFormat] {
-# version: 0
-# algorithm: RS256
-# modulus_size_in_bits: 3072
-# public_exponent: "\001\000\001"
-# }
-value: "\020\001\030\200\030\"\003\001\000\001"
-output_prefix_type: TINK
diff --git a/testdata/templates/jwt/JWT_RS256_3072_F4_RAW b/testdata/templates/jwt/JWT_RS256_3072_F4_RAW
deleted file mode 100644
index 229b5f6..0000000
--- a/testdata/templates/jwt/JWT_RS256_3072_F4_RAW
+++ /dev/null
@@ -1,9 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtRsaSsaPkcs1PrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtRsaSsaPkcs1KeyFormat] {
-# version: 0
-# algorithm: RS256
-# modulus_size_in_bits: 3072
-# public_exponent: "\001\000\001"
-# }
-value: "\020\001\030\200\030\"\003\001\000\001"
-output_prefix_type: RAW
diff --git a/testdata/templates/jwt/JWT_RS384_3072_F4 b/testdata/templates/jwt/JWT_RS384_3072_F4
deleted file mode 100644
index 4e6c5fc..0000000
--- a/testdata/templates/jwt/JWT_RS384_3072_F4
+++ /dev/null
@@ -1,9 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtRsaSsaPkcs1PrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtRsaSsaPkcs1KeyFormat] {
-# version: 0
-# algorithm: RS384
-# modulus_size_in_bits: 3072
-# public_exponent: "\001\000\001"
-# }
-value: "\020\002\030\200\030\"\003\001\000\001"
-output_prefix_type: TINK
diff --git a/testdata/templates/jwt/JWT_RS384_3072_F4_RAW b/testdata/templates/jwt/JWT_RS384_3072_F4_RAW
deleted file mode 100644
index d6455b9..0000000
--- a/testdata/templates/jwt/JWT_RS384_3072_F4_RAW
+++ /dev/null
@@ -1,9 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtRsaSsaPkcs1PrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtRsaSsaPkcs1KeyFormat] {
-# version: 0
-# algorithm: RS384
-# modulus_size_in_bits: 3072
-# public_exponent: "\001\000\001"
-# }
-value: "\020\002\030\200\030\"\003\001\000\001"
-output_prefix_type: RAW
diff --git a/testdata/templates/jwt/JWT_RS512_4096_F4 b/testdata/templates/jwt/JWT_RS512_4096_F4
deleted file mode 100644
index 7043f74..0000000
--- a/testdata/templates/jwt/JWT_RS512_4096_F4
+++ /dev/null
@@ -1,9 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtRsaSsaPkcs1PrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtRsaSsaPkcs1KeyFormat] {
-# version: 0
-# algorithm: RS512
-# modulus_size_in_bits: 4096
-# public_exponent: "\001\000\001"
-# }
-value: "\020\003\030\200 \"\003\001\000\001"
-output_prefix_type: TINK
diff --git a/testdata/templates/jwt/JWT_RS512_4096_F4_RAW b/testdata/templates/jwt/JWT_RS512_4096_F4_RAW
deleted file mode 100644
index a8fe379..0000000
--- a/testdata/templates/jwt/JWT_RS512_4096_F4_RAW
+++ /dev/null
@@ -1,9 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.JwtRsaSsaPkcs1PrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.JwtRsaSsaPkcs1KeyFormat] {
-# version: 0
-# algorithm: RS512
-# modulus_size_in_bits: 4096
-# public_exponent: "\001\000\001"
-# }
-value: "\020\003\030\200 \"\003\001\000\001"
-output_prefix_type: RAW
diff --git a/testdata/templates/mac/AES_CMAC b/testdata/templates/mac/AES_CMAC
deleted file mode 100644
index a31d0ee..0000000
--- a/testdata/templates/mac/AES_CMAC
+++ /dev/null
@@ -1,9 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.AesCmacKey"
-# value: [type.googleapis.com/google.crypto.tink.AesCmacKeyFormat] {
-# key_size: 32
-# params {
-# tag_size: 16
-# }
-# }
-value: "\010 \022\002\010\020"
-output_prefix_type: TINK
diff --git a/testdata/templates/mac/HMAC_SHA256_128BITTAG b/testdata/templates/mac/HMAC_SHA256_128BITTAG
deleted file mode 100644
index 163465d..0000000
--- a/testdata/templates/mac/HMAC_SHA256_128BITTAG
+++ /dev/null
@@ -1,11 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.HmacKey"
-# value: [type.googleapis.com/google.crypto.tink.HmacKeyFormat] {
-# params {
-# hash: SHA256
-# tag_size: 16
-# }
-# key_size: 32
-# version: 0
-# }
-value: "\n\004\010\003\020\020\020 "
-output_prefix_type: TINK
diff --git a/testdata/templates/mac/HMAC_SHA256_256BITTAG b/testdata/templates/mac/HMAC_SHA256_256BITTAG
deleted file mode 100644
index 1ab80e4..0000000
--- a/testdata/templates/mac/HMAC_SHA256_256BITTAG
+++ /dev/null
@@ -1,11 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.HmacKey"
-# value: [type.googleapis.com/google.crypto.tink.HmacKeyFormat] {
-# params {
-# hash: SHA256
-# tag_size: 32
-# }
-# key_size: 32
-# version: 0
-# }
-value: "\n\004\010\003\020 \020 "
-output_prefix_type: TINK
diff --git a/testdata/templates/mac/HMAC_SHA512_256BITTAG b/testdata/templates/mac/HMAC_SHA512_256BITTAG
deleted file mode 100644
index 6dec949..0000000
--- a/testdata/templates/mac/HMAC_SHA512_256BITTAG
+++ /dev/null
@@ -1,11 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.HmacKey"
-# value: [type.googleapis.com/google.crypto.tink.HmacKeyFormat] {
-# params {
-# hash: SHA512
-# tag_size: 32
-# }
-# key_size: 64
-# version: 0
-# }
-value: "\n\004\010\004\020 \020@"
-output_prefix_type: TINK
diff --git a/testdata/templates/mac/HMAC_SHA512_512BITTAG b/testdata/templates/mac/HMAC_SHA512_512BITTAG
deleted file mode 100644
index 401348f..0000000
--- a/testdata/templates/mac/HMAC_SHA512_512BITTAG
+++ /dev/null
@@ -1,11 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.HmacKey"
-# value: [type.googleapis.com/google.crypto.tink.HmacKeyFormat] {
-# params {
-# hash: SHA512
-# tag_size: 64
-# }
-# key_size: 64
-# version: 0
-# }
-value: "\n\004\010\004\020@\020@"
-output_prefix_type: TINK
diff --git a/testdata/templates/prf/AES_CMAC_PRF b/testdata/templates/prf/AES_CMAC_PRF
deleted file mode 100644
index ada3a51..0000000
--- a/testdata/templates/prf/AES_CMAC_PRF
+++ /dev/null
@@ -1,7 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.AesCmacPrfKey"
-# value: [type.googleapis.com/google.crypto.tink.AesCmacPrfKeyFormat] {
-# version: 0
-# key_size: 32
-# }
-value: "\010 "
-output_prefix_type: RAW
diff --git a/testdata/templates/prf/HKDF_SHA256 b/testdata/templates/prf/HKDF_SHA256
deleted file mode 100644
index 9ae68e0..0000000
--- a/testdata/templates/prf/HKDF_SHA256
+++ /dev/null
@@ -1,11 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.HkdfPrfKey"
-# value: [type.googleapis.com/google.crypto.tink.HkdfPrfKeyFormat] {
-# params {
-# hash: SHA256
-# salt: ""
-# }
-# key_size: 32
-# version: 0
-# }
-value: "\n\002\010\003\020 "
-output_prefix_type: RAW
diff --git a/testdata/templates/prf/HMAC_SHA256_PRF b/testdata/templates/prf/HMAC_SHA256_PRF
deleted file mode 100644
index c3f44d4..0000000
--- a/testdata/templates/prf/HMAC_SHA256_PRF
+++ /dev/null
@@ -1,10 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.HmacPrfKey"
-# value: [type.googleapis.com/google.crypto.tink.HmacPrfKeyFormat] {
-# params {
-# hash: SHA256
-# }
-# key_size: 32
-# version: 0
-# }
-value: "\n\002\010\003\020 "
-output_prefix_type: RAW
diff --git a/testdata/templates/prf/HMAC_SHA512_PRF b/testdata/templates/prf/HMAC_SHA512_PRF
deleted file mode 100644
index ab0b19c..0000000
--- a/testdata/templates/prf/HMAC_SHA512_PRF
+++ /dev/null
@@ -1,10 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.HmacPrfKey"
-# value: [type.googleapis.com/google.crypto.tink.HmacPrfKeyFormat] {
-# params {
-# hash: SHA512
-# }
-# key_size: 64
-# version: 0
-# }
-value: "\n\002\010\004\020@"
-output_prefix_type: RAW
diff --git a/testdata/templates/signature/ECDSA_P256 b/testdata/templates/signature/ECDSA_P256
deleted file mode 100644
index 91f7417..0000000
--- a/testdata/templates/signature/ECDSA_P256
+++ /dev/null
@@ -1,10 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.EcdsaPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.EcdsaKeyFormat] {
-# params {
-# hash_type: SHA256
-# curve: NIST_P256
-# encoding: DER
-# }
-# }
-value: "\022\006\010\003\020\002\030\002"
-output_prefix_type: TINK
diff --git a/testdata/templates/signature/ECDSA_P256_IEEE_P1363 b/testdata/templates/signature/ECDSA_P256_IEEE_P1363
deleted file mode 100644
index 0f443c5..0000000
--- a/testdata/templates/signature/ECDSA_P256_IEEE_P1363
+++ /dev/null
@@ -1,10 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.EcdsaPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.EcdsaKeyFormat] {
-# params {
-# hash_type: SHA256
-# curve: NIST_P256
-# encoding: IEEE_P1363
-# }
-# }
-value: "\022\006\010\003\020\002\030\001"
-output_prefix_type: TINK
diff --git a/testdata/templates/signature/ECDSA_P384 b/testdata/templates/signature/ECDSA_P384
deleted file mode 100644
index eead26d..0000000
--- a/testdata/templates/signature/ECDSA_P384
+++ /dev/null
@@ -1,10 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.EcdsaPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.EcdsaKeyFormat] {
-# params {
-# hash_type: SHA512
-# curve: NIST_P384
-# encoding: DER
-# }
-# }
-value: "\022\006\010\004\020\003\030\002"
-output_prefix_type: TINK
diff --git a/testdata/templates/signature/ECDSA_P384_IEEE_P1363 b/testdata/templates/signature/ECDSA_P384_IEEE_P1363
deleted file mode 100644
index 92f2d46..0000000
--- a/testdata/templates/signature/ECDSA_P384_IEEE_P1363
+++ /dev/null
@@ -1,10 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.EcdsaPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.EcdsaKeyFormat] {
-# params {
-# hash_type: SHA512
-# curve: NIST_P384
-# encoding: IEEE_P1363
-# }
-# }
-value: "\022\006\010\004\020\003\030\001"
-output_prefix_type: TINK
diff --git a/testdata/templates/signature/ECDSA_P384_SHA384 b/testdata/templates/signature/ECDSA_P384_SHA384
deleted file mode 100644
index dc23874..0000000
--- a/testdata/templates/signature/ECDSA_P384_SHA384
+++ /dev/null
@@ -1,10 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.EcdsaPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.EcdsaKeyFormat] {
-# params {
-# hash_type: SHA384
-# curve: NIST_P384
-# encoding: DER
-# }
-# }
-value: "\022\006\010\002\020\003\030\002"
-output_prefix_type: TINK
diff --git a/testdata/templates/signature/ECDSA_P384_SHA384_IEEE_P1363 b/testdata/templates/signature/ECDSA_P384_SHA384_IEEE_P1363
deleted file mode 100644
index 40c5c04..0000000
--- a/testdata/templates/signature/ECDSA_P384_SHA384_IEEE_P1363
+++ /dev/null
@@ -1,10 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.EcdsaPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.EcdsaKeyFormat] {
-# params {
-# hash_type: SHA384
-# curve: NIST_P384
-# encoding: IEEE_P1363
-# }
-# }
-value: "\022\006\010\002\020\003\030\001"
-output_prefix_type: TINK
diff --git a/testdata/templates/signature/ECDSA_P521 b/testdata/templates/signature/ECDSA_P521
deleted file mode 100644
index 51369a1..0000000
--- a/testdata/templates/signature/ECDSA_P521
+++ /dev/null
@@ -1,10 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.EcdsaPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.EcdsaKeyFormat] {
-# params {
-# hash_type: SHA512
-# curve: NIST_P521
-# encoding: DER
-# }
-# }
-value: "\022\006\010\004\020\004\030\002"
-output_prefix_type: TINK
diff --git a/testdata/templates/signature/ECDSA_P521_IEEE_P1363 b/testdata/templates/signature/ECDSA_P521_IEEE_P1363
deleted file mode 100644
index 8ccb0e4..0000000
--- a/testdata/templates/signature/ECDSA_P521_IEEE_P1363
+++ /dev/null
@@ -1,10 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.EcdsaPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.EcdsaKeyFormat] {
-# params {
-# hash_type: SHA512
-# curve: NIST_P521
-# encoding: IEEE_P1363
-# }
-# }
-value: "\022\006\010\004\020\004\030\001"
-output_prefix_type: TINK
diff --git a/testdata/templates/signature/ED25519 b/testdata/templates/signature/ED25519
deleted file mode 100644
index 55d64cf..0000000
--- a/testdata/templates/signature/ED25519
+++ /dev/null
@@ -1,2 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.Ed25519PrivateKey"
-output_prefix_type: TINK
diff --git a/testdata/templates/signature/RSA_SSA_PKCS1_3072_SHA256_F4 b/testdata/templates/signature/RSA_SSA_PKCS1_3072_SHA256_F4
deleted file mode 100644
index 5b3c40d..0000000
--- a/testdata/templates/signature/RSA_SSA_PKCS1_3072_SHA256_F4
+++ /dev/null
@@ -1,10 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.RsaSsaPkcs1PrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.RsaSsaPkcs1KeyFormat] {
-# params {
-# hash_type: SHA256
-# }
-# modulus_size_in_bits: 3072
-# public_exponent: "\001\000\001"
-# }
-value: "\n\002\010\003\020\200\030\032\003\001\000\001"
-output_prefix_type: TINK
diff --git a/testdata/templates/signature/RSA_SSA_PKCS1_4096_SHA512_F4 b/testdata/templates/signature/RSA_SSA_PKCS1_4096_SHA512_F4
deleted file mode 100644
index 66e6ae9..0000000
--- a/testdata/templates/signature/RSA_SSA_PKCS1_4096_SHA512_F4
+++ /dev/null
@@ -1,10 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.RsaSsaPkcs1PrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.RsaSsaPkcs1KeyFormat] {
-# params {
-# hash_type: SHA512
-# }
-# modulus_size_in_bits: 4096
-# public_exponent: "\001\000\001"
-# }
-value: "\n\002\010\004\020\200 \032\003\001\000\001"
-output_prefix_type: TINK
diff --git a/testdata/templates/signature/RSA_SSA_PSS_3072_SHA256_SHA256_32_F4 b/testdata/templates/signature/RSA_SSA_PSS_3072_SHA256_SHA256_32_F4
deleted file mode 100644
index 94b279c..0000000
--- a/testdata/templates/signature/RSA_SSA_PSS_3072_SHA256_SHA256_32_F4
+++ /dev/null
@@ -1,12 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.RsaSsaPssPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.RsaSsaPssKeyFormat] {
-# params {
-# sig_hash: SHA256
-# mgf1_hash: SHA256
-# salt_length: 32
-# }
-# modulus_size_in_bits: 3072
-# public_exponent: "\001\000\001"
-# }
-value: "\n\006\010\003\020\003\030 \020\200\030\032\003\001\000\001"
-output_prefix_type: TINK
diff --git a/testdata/templates/signature/RSA_SSA_PSS_4096_SHA512_SHA512_64_F4 b/testdata/templates/signature/RSA_SSA_PSS_4096_SHA512_SHA512_64_F4
deleted file mode 100644
index f8dc910..0000000
--- a/testdata/templates/signature/RSA_SSA_PSS_4096_SHA512_SHA512_64_F4
+++ /dev/null
@@ -1,12 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.RsaSsaPssPrivateKey"
-# value: [type.googleapis.com/google.crypto.tink.RsaSsaPssKeyFormat] {
-# params {
-# sig_hash: SHA512
-# mgf1_hash: SHA512
-# salt_length: 64
-# }
-# modulus_size_in_bits: 4096
-# public_exponent: "\001\000\001"
-# }
-value: "\n\006\010\004\020\004\030@\020\200 \032\003\001\000\001"
-output_prefix_type: TINK
diff --git a/testdata/templates/streamingaead/AES128_CTR_HMAC_SHA256_1MB b/testdata/templates/streamingaead/AES128_CTR_HMAC_SHA256_1MB
deleted file mode 100644
index a6782ef..0000000
--- a/testdata/templates/streamingaead/AES128_CTR_HMAC_SHA256_1MB
+++ /dev/null
@@ -1,16 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.AesCtrHmacStreamingKey"
-# value: [type.googleapis.com/google.crypto.tink.AesCtrHmacStreamingKeyFormat] {
-# version: 0
-# params {
-# ciphertext_segment_size: 1048576
-# derived_key_size: 16
-# hkdf_hash_type: SHA256
-# hmac_params {
-# hash: SHA256
-# tag_size: 32
-# }
-# }
-# key_size: 16
-# }
-value: "\n\016\010\200\200@\020\020\030\003\"\004\010\003\020 \020\020"
-output_prefix_type: RAW
diff --git a/testdata/templates/streamingaead/AES128_CTR_HMAC_SHA256_4KB b/testdata/templates/streamingaead/AES128_CTR_HMAC_SHA256_4KB
deleted file mode 100644
index 327412d..0000000
--- a/testdata/templates/streamingaead/AES128_CTR_HMAC_SHA256_4KB
+++ /dev/null
@@ -1,16 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.AesCtrHmacStreamingKey"
-# value: [type.googleapis.com/google.crypto.tink.AesCtrHmacStreamingKeyFormat] {
-# version: 0
-# params {
-# ciphertext_segment_size: 4096
-# derived_key_size: 16
-# hkdf_hash_type: SHA256
-# hmac_params {
-# hash: SHA256
-# tag_size: 32
-# }
-# }
-# key_size: 16
-# }
-value: "\n\r\010\200 \020\020\030\003\"\004\010\003\020 \020\020"
-output_prefix_type: RAW
diff --git a/testdata/templates/streamingaead/AES128_GCM_HKDF_1MB b/testdata/templates/streamingaead/AES128_GCM_HKDF_1MB
deleted file mode 100644
index 5089f77..0000000
--- a/testdata/templates/streamingaead/AES128_GCM_HKDF_1MB
+++ /dev/null
@@ -1,12 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.AesGcmHkdfStreamingKey"
-# value: [type.googleapis.com/google.crypto.tink.AesGcmHkdfStreamingKeyFormat] {
-# version: 0
-# params {
-# ciphertext_segment_size: 1048576
-# derived_key_size: 16
-# hkdf_hash_type: SHA256
-# }
-# key_size: 16
-# }
-value: "\n\010\010\200\200@\020\020\030\003\020\020"
-output_prefix_type: RAW
diff --git a/testdata/templates/streamingaead/AES128_GCM_HKDF_4KB b/testdata/templates/streamingaead/AES128_GCM_HKDF_4KB
deleted file mode 100644
index 6b75629..0000000
--- a/testdata/templates/streamingaead/AES128_GCM_HKDF_4KB
+++ /dev/null
@@ -1,12 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.AesGcmHkdfStreamingKey"
-# value: [type.googleapis.com/google.crypto.tink.AesGcmHkdfStreamingKeyFormat] {
-# version: 0
-# params {
-# ciphertext_segment_size: 4096
-# derived_key_size: 16
-# hkdf_hash_type: SHA256
-# }
-# key_size: 16
-# }
-value: "\n\007\010\200 \020\020\030\003\020\020"
-output_prefix_type: RAW
diff --git a/testdata/templates/streamingaead/AES256_CTR_HMAC_SHA256_1MB b/testdata/templates/streamingaead/AES256_CTR_HMAC_SHA256_1MB
deleted file mode 100644
index ffca418..0000000
--- a/testdata/templates/streamingaead/AES256_CTR_HMAC_SHA256_1MB
+++ /dev/null
@@ -1,16 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.AesCtrHmacStreamingKey"
-# value: [type.googleapis.com/google.crypto.tink.AesCtrHmacStreamingKeyFormat] {
-# version: 0
-# params {
-# ciphertext_segment_size: 1048576
-# derived_key_size: 32
-# hkdf_hash_type: SHA256
-# hmac_params {
-# hash: SHA256
-# tag_size: 32
-# }
-# }
-# key_size: 32
-# }
-value: "\n\016\010\200\200@\020 \030\003\"\004\010\003\020 \020 "
-output_prefix_type: RAW
diff --git a/testdata/templates/streamingaead/AES256_CTR_HMAC_SHA256_4KB b/testdata/templates/streamingaead/AES256_CTR_HMAC_SHA256_4KB
deleted file mode 100644
index 79bb9de..0000000
--- a/testdata/templates/streamingaead/AES256_CTR_HMAC_SHA256_4KB
+++ /dev/null
@@ -1,16 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.AesCtrHmacStreamingKey"
-# value: [type.googleapis.com/google.crypto.tink.AesCtrHmacStreamingKeyFormat] {
-# version: 0
-# params {
-# ciphertext_segment_size: 4096
-# derived_key_size: 32
-# hkdf_hash_type: SHA256
-# hmac_params {
-# hash: SHA256
-# tag_size: 32
-# }
-# }
-# key_size: 32
-# }
-value: "\n\r\010\200 \020 \030\003\"\004\010\003\020 \020 "
-output_prefix_type: RAW
diff --git a/testdata/templates/streamingaead/AES256_GCM_HKDF_1MB b/testdata/templates/streamingaead/AES256_GCM_HKDF_1MB
deleted file mode 100644
index abb630f..0000000
--- a/testdata/templates/streamingaead/AES256_GCM_HKDF_1MB
+++ /dev/null
@@ -1,12 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.AesGcmHkdfStreamingKey"
-# value: [type.googleapis.com/google.crypto.tink.AesGcmHkdfStreamingKeyFormat] {
-# version: 0
-# params {
-# ciphertext_segment_size: 1048576
-# derived_key_size: 32
-# hkdf_hash_type: SHA256
-# }
-# key_size: 32
-# }
-value: "\n\010\010\200\200@\020 \030\003\020 "
-output_prefix_type: RAW
diff --git a/testdata/templates/streamingaead/AES256_GCM_HKDF_4KB b/testdata/templates/streamingaead/AES256_GCM_HKDF_4KB
deleted file mode 100644
index 7124ac6..0000000
--- a/testdata/templates/streamingaead/AES256_GCM_HKDF_4KB
+++ /dev/null
@@ -1,12 +0,0 @@
-type_url: "type.googleapis.com/google.crypto.tink.AesGcmHkdfStreamingKey"
-# value: [type.googleapis.com/google.crypto.tink.AesGcmHkdfStreamingKeyFormat] {
-# version: 0
-# params {
-# ciphertext_segment_size: 4096
-# derived_key_size: 32
-# hkdf_hash_type: SHA256
-# }
-# key_size: 32
-# }
-value: "\n\007\010\200 \020 \030\003\020 "
-output_prefix_type: RAW
