diff --git a/test/duplicate_consistency/sphincs-haraka-128f-robust_clean.yml b/test/duplicate_consistency/sphincs-haraka-128f-robust_clean.yml
new file mode 100644
index 00000000..2e1392df
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-haraka-128f-robust_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-128f-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-haraka-256s-robust
+    implementation: clean
+  files:
+    - hash_haraka.c
+- source:
+    scheme: sphincs-haraka-256s-robust
+    implementation: clean
+  files:
+    - thash_haraka_robust.c
diff --git a/test/duplicate_consistency/sphincs-haraka-128f-simple_clean.yml b/test/duplicate_consistency/sphincs-haraka-128f-simple_clean.yml
new file mode 100644
index 00000000..d23ff294
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-haraka-128f-simple_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-128f-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-haraka-256s-robust
+    implementation: clean
+  files:
+    - hash_haraka.c
+- source:
+    scheme: sphincs-haraka-256s-simple
+    implementation: clean
+  files:
+    - thash_haraka_simple.c
diff --git a/test/duplicate_consistency/sphincs-haraka-128s-robust_clean.yml b/test/duplicate_consistency/sphincs-haraka-128s-robust_clean.yml
new file mode 100644
index 00000000..c15be28b
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-haraka-128s-robust_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-128s-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-haraka-256s-robust
+    implementation: clean
+  files:
+    - hash_haraka.c
+- source:
+    scheme: sphincs-haraka-256s-robust
+    implementation: clean
+  files:
+    - thash_haraka_robust.c
diff --git a/test/duplicate_consistency/sphincs-haraka-128s-simple_clean.yml b/test/duplicate_consistency/sphincs-haraka-128s-simple_clean.yml
new file mode 100644
index 00000000..6a2193f2
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-haraka-128s-simple_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-128s-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-haraka-256s-robust
+    implementation: clean
+  files:
+    - hash_haraka.c
+- source:
+    scheme: sphincs-haraka-256s-simple
+    implementation: clean
+  files:
+    - thash_haraka_simple.c
diff --git a/test/duplicate_consistency/sphincs-haraka-192f-robust_clean.yml b/test/duplicate_consistency/sphincs-haraka-192f-robust_clean.yml
new file mode 100644
index 00000000..3faf9810
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-haraka-192f-robust_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-192f-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-haraka-256s-robust
+    implementation: clean
+  files:
+    - hash_haraka.c
+- source:
+    scheme: sphincs-haraka-256s-robust
+    implementation: clean
+  files:
+    - thash_haraka_robust.c
diff --git a/test/duplicate_consistency/sphincs-haraka-192f-simple_clean.yml b/test/duplicate_consistency/sphincs-haraka-192f-simple_clean.yml
new file mode 100644
index 00000000..9905ef9b
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-haraka-192f-simple_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-192f-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-haraka-256s-robust
+    implementation: clean
+  files:
+    - hash_haraka.c
+- source:
+    scheme: sphincs-haraka-256s-simple
+    implementation: clean
+  files:
+    - thash_haraka_simple.c
diff --git a/test/duplicate_consistency/sphincs-haraka-192s-robust_clean.yml b/test/duplicate_consistency/sphincs-haraka-192s-robust_clean.yml
new file mode 100644
index 00000000..91928a5c
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-haraka-192s-robust_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-192s-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-haraka-256s-robust
+    implementation: clean
+  files:
+    - hash_haraka.c
+- source:
+    scheme: sphincs-haraka-256s-robust
+    implementation: clean
+  files:
+    - thash_haraka_robust.c
diff --git a/test/duplicate_consistency/sphincs-haraka-192s-simple_clean.yml b/test/duplicate_consistency/sphincs-haraka-192s-simple_clean.yml
new file mode 100644
index 00000000..fa531d46
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-haraka-192s-simple_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-192s-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-haraka-256s-robust
+    implementation: clean
+  files:
+    - hash_haraka.c
+- source:
+    scheme: sphincs-haraka-256s-simple
+    implementation: clean
+  files:
+    - thash_haraka_simple.c
diff --git a/test/duplicate_consistency/sphincs-haraka-256f-robust_clean.yml b/test/duplicate_consistency/sphincs-haraka-256f-robust_clean.yml
new file mode 100644
index 00000000..36cea0fe
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-haraka-256f-robust_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-256f-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-haraka-256s-robust
+    implementation: clean
+  files:
+    - hash_haraka.c
+- source:
+    scheme: sphincs-haraka-256s-robust
+    implementation: clean
+  files:
+    - thash_haraka_robust.c
diff --git a/test/duplicate_consistency/sphincs-haraka-256f-simple_clean.yml b/test/duplicate_consistency/sphincs-haraka-256f-simple_clean.yml
new file mode 100644
index 00000000..a378d25a
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-haraka-256f-simple_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-256f-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-haraka-256s-robust
+    implementation: clean
+  files:
+    - hash_haraka.c
+- source:
+    scheme: sphincs-haraka-256s-simple
+    implementation: clean
+  files:
+    - thash_haraka_simple.c
diff --git a/test/duplicate_consistency/sphincs-haraka-256s-robust_clean.yml b/test/duplicate_consistency/sphincs-haraka-256s-robust_clean.yml
new file mode 100644
index 00000000..0865fa3d
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-haraka-256s-robust_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-haraka-256s-robust
+    implementation: clean
+  files:
+    - hash_haraka.c
+- source:
+    scheme: sphincs-haraka-256s-robust
+    implementation: clean
+  files:
+    - thash_haraka_robust.c
diff --git a/test/duplicate_consistency/sphincs-haraka-256s-simple_clean.yml b/test/duplicate_consistency/sphincs-haraka-256s-simple_clean.yml
new file mode 100644
index 00000000..50b13b7e
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-haraka-256s-simple_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-haraka-256s-robust
+    implementation: clean
+  files:
+    - hash_haraka.c
+- source:
+    scheme: sphincs-haraka-256s-simple
+    implementation: clean
+  files:
+    - thash_haraka_simple.c
diff --git a/test/duplicate_consistency/sphincs-sha256-128f-robust_clean.yml b/test/duplicate_consistency/sphincs-sha256-128f-robust_clean.yml
new file mode 100644
index 00000000..3569c280
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-sha256-128f-robust_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-128f-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-sha256-256s-robust
+    implementation: clean
+  files:
+    - hash_sha256.c
+- source:
+    scheme: sphincs-sha256-256s-robust
+    implementation: clean
+  files:
+    - thash_sha256_robust.c
diff --git a/test/duplicate_consistency/sphincs-sha256-128f-simple_clean.yml b/test/duplicate_consistency/sphincs-sha256-128f-simple_clean.yml
new file mode 100644
index 00000000..e11d6ef0
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-sha256-128f-simple_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-128f-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-sha256-256s-robust
+    implementation: clean
+  files:
+    - hash_sha256.c
+- source:
+    scheme: sphincs-sha256-256s-simple
+    implementation: clean
+  files:
+    - thash_sha256_simple.c
diff --git a/test/duplicate_consistency/sphincs-sha256-128s-robust_clean.yml b/test/duplicate_consistency/sphincs-sha256-128s-robust_clean.yml
new file mode 100644
index 00000000..3f6ee84f
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-sha256-128s-robust_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-128s-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-sha256-256s-robust
+    implementation: clean
+  files:
+    - hash_sha256.c
+- source:
+    scheme: sphincs-sha256-256s-robust
+    implementation: clean
+  files:
+    - thash_sha256_robust.c
diff --git a/test/duplicate_consistency/sphincs-sha256-128s-simple_clean.yml b/test/duplicate_consistency/sphincs-sha256-128s-simple_clean.yml
new file mode 100644
index 00000000..fba64e51
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-sha256-128s-simple_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-128s-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-sha256-256s-robust
+    implementation: clean
+  files:
+    - hash_sha256.c
+- source:
+    scheme: sphincs-sha256-256s-simple
+    implementation: clean
+  files:
+    - thash_sha256_simple.c
diff --git a/test/duplicate_consistency/sphincs-sha256-192f-robust_clean.yml b/test/duplicate_consistency/sphincs-sha256-192f-robust_clean.yml
new file mode 100644
index 00000000..0b803e12
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-sha256-192f-robust_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-192f-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-sha256-256s-robust
+    implementation: clean
+  files:
+    - hash_sha256.c
+- source:
+    scheme: sphincs-sha256-256s-robust
+    implementation: clean
+  files:
+    - thash_sha256_robust.c
diff --git a/test/duplicate_consistency/sphincs-sha256-192f-simple_clean.yml b/test/duplicate_consistency/sphincs-sha256-192f-simple_clean.yml
new file mode 100644
index 00000000..0cc91c41
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-sha256-192f-simple_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-192f-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-sha256-256s-robust
+    implementation: clean
+  files:
+    - hash_sha256.c
+- source:
+    scheme: sphincs-sha256-256s-simple
+    implementation: clean
+  files:
+    - thash_sha256_simple.c
diff --git a/test/duplicate_consistency/sphincs-sha256-192s-robust_clean.yml b/test/duplicate_consistency/sphincs-sha256-192s-robust_clean.yml
new file mode 100644
index 00000000..09074d4d
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-sha256-192s-robust_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-192s-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-sha256-256s-robust
+    implementation: clean
+  files:
+    - hash_sha256.c
+- source:
+    scheme: sphincs-sha256-256s-robust
+    implementation: clean
+  files:
+    - thash_sha256_robust.c
diff --git a/test/duplicate_consistency/sphincs-sha256-192s-simple_clean.yml b/test/duplicate_consistency/sphincs-sha256-192s-simple_clean.yml
new file mode 100644
index 00000000..f9997876
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-sha256-192s-simple_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-192s-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-sha256-256s-robust
+    implementation: clean
+  files:
+    - hash_sha256.c
+- source:
+    scheme: sphincs-sha256-256s-simple
+    implementation: clean
+  files:
+    - thash_sha256_simple.c
diff --git a/test/duplicate_consistency/sphincs-sha256-256f-robust_clean.yml b/test/duplicate_consistency/sphincs-sha256-256f-robust_clean.yml
new file mode 100644
index 00000000..95bbb714
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-sha256-256f-robust_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-256f-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-sha256-256s-robust
+    implementation: clean
+  files:
+    - hash_sha256.c
+- source:
+    scheme: sphincs-sha256-256s-robust
+    implementation: clean
+  files:
+    - thash_sha256_robust.c
diff --git a/test/duplicate_consistency/sphincs-sha256-256f-simple_clean.yml b/test/duplicate_consistency/sphincs-sha256-256f-simple_clean.yml
new file mode 100644
index 00000000..d3e30957
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-sha256-256f-simple_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-256f-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-sha256-256s-robust
+    implementation: clean
+  files:
+    - hash_sha256.c
+- source:
+    scheme: sphincs-sha256-256s-simple
+    implementation: clean
+  files:
+    - thash_sha256_simple.c
diff --git a/test/duplicate_consistency/sphincs-sha256-256s-robust_clean.yml b/test/duplicate_consistency/sphincs-sha256-256s-robust_clean.yml
new file mode 100644
index 00000000..68df69a6
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-sha256-256s-robust_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-sha256-256s-robust
+    implementation: clean
+  files:
+    - hash_sha256.c
+- source:
+    scheme: sphincs-sha256-256s-robust
+    implementation: clean
+  files:
+    - thash_sha256_robust.c
diff --git a/test/duplicate_consistency/sphincs-sha256-256s-simple_clean.yml b/test/duplicate_consistency/sphincs-sha256-256s-simple_clean.yml
new file mode 100644
index 00000000..d5da9791
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-sha256-256s-simple_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-sha256-256s-robust
+    implementation: clean
+  files:
+    - hash_sha256.c
+- source:
+    scheme: sphincs-sha256-256s-simple
+    implementation: clean
+  files:
+    - thash_sha256_simple.c
diff --git a/test/duplicate_consistency/sphincs-shake256-128f-robust_clean.yml b/test/duplicate_consistency/sphincs-shake256-128f-robust_clean.yml
new file mode 100644
index 00000000..022c0c43
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-shake256-128f-robust_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-128f-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - hash_shake256.c
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - thash_shake256_robust.c
diff --git a/test/duplicate_consistency/sphincs-shake256-128f-simple_clean.yml b/test/duplicate_consistency/sphincs-shake256-128f-simple_clean.yml
new file mode 100644
index 00000000..16d118bd
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-shake256-128f-simple_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-128f-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - hash_shake256.c
+- source:
+    scheme: sphincs-shake256-256s-simple
+    implementation: clean
+  files:
+    - thash_shake256_simple.c
diff --git a/test/duplicate_consistency/sphincs-shake256-128s-robust_clean.yml b/test/duplicate_consistency/sphincs-shake256-128s-robust_clean.yml
new file mode 100644
index 00000000..45e99938
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-shake256-128s-robust_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-128s-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - hash_shake256.c
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - thash_shake256_robust.c
diff --git a/test/duplicate_consistency/sphincs-shake256-128s-simple_clean.yml b/test/duplicate_consistency/sphincs-shake256-128s-simple_clean.yml
new file mode 100644
index 00000000..202d02b2
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-shake256-128s-simple_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-128s-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - hash_shake256.c
+- source:
+    scheme: sphincs-shake256-256s-simple
+    implementation: clean
+  files:
+    - thash_shake256_simple.c
diff --git a/test/duplicate_consistency/sphincs-shake256-192f-robust_clean.yml b/test/duplicate_consistency/sphincs-shake256-192f-robust_clean.yml
new file mode 100644
index 00000000..5691560d
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-shake256-192f-robust_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-192f-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - hash_shake256.c
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - thash_shake256_robust.c
diff --git a/test/duplicate_consistency/sphincs-shake256-192f-simple_clean.yml b/test/duplicate_consistency/sphincs-shake256-192f-simple_clean.yml
new file mode 100644
index 00000000..c90ae314
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-shake256-192f-simple_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-192f-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - hash_shake256.c
+- source:
+    scheme: sphincs-shake256-256s-simple
+    implementation: clean
+  files:
+    - thash_shake256_simple.c
diff --git a/test/duplicate_consistency/sphincs-shake256-192s-robust_clean.yml b/test/duplicate_consistency/sphincs-shake256-192s-robust_clean.yml
new file mode 100644
index 00000000..c9729217
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-shake256-192s-robust_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-192s-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - hash_shake256.c
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - thash_shake256_robust.c
diff --git a/test/duplicate_consistency/sphincs-shake256-192s-simple_clean.yml b/test/duplicate_consistency/sphincs-shake256-192s-simple_clean.yml
new file mode 100644
index 00000000..28790a2a
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-shake256-192s-simple_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-192s-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - hash_shake256.c
+- source:
+    scheme: sphincs-shake256-256s-simple
+    implementation: clean
+  files:
+    - thash_shake256_simple.c
diff --git a/test/duplicate_consistency/sphincs-shake256-256f-robust_clean.yml b/test/duplicate_consistency/sphincs-shake256-256f-robust_clean.yml
new file mode 100644
index 00000000..7e8ef0d7
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-shake256-256f-robust_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-256f-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - hash_shake256.c
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - thash_shake256_robust.c
diff --git a/test/duplicate_consistency/sphincs-shake256-256f-simple_clean.yml b/test/duplicate_consistency/sphincs-shake256-256f-simple_clean.yml
new file mode 100644
index 00000000..69789347
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-shake256-256f-simple_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-256f-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - hash_shake256.c
+- source:
+    scheme: sphincs-shake256-256s-simple
+    implementation: clean
+  files:
+    - thash_shake256_simple.c
diff --git a/test/duplicate_consistency/sphincs-shake256-256s-robust_clean.yml b/test/duplicate_consistency/sphincs-shake256-256s-robust_clean.yml
new file mode 100644
index 00000000..636dd828
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-shake256-256s-robust_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - hash_shake256.c
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - thash_shake256_robust.c
diff --git a/test/duplicate_consistency/sphincs-shake256-256s-simple_clean.yml b/test/duplicate_consistency/sphincs-shake256-256s-simple_clean.yml
new file mode 100644
index 00000000..153ee6fb
--- /dev/null
+++ b/test/duplicate_consistency/sphincs-shake256-256s-simple_clean.yml
@@ -0,0 +1,31 @@
+consistency_checks:
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - address.c
+    - address.h
+    - fors.c
+    - fors.h
+    - hash.h
+    - sign.c
+    - thash.h
+    - utils.c
+    - utils.h
+    - wots.c
+    - wots.h
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - params.h
+- source:
+    scheme: sphincs-shake256-256s-robust
+    implementation: clean
+  files:
+    - hash_shake256.c
+- source:
+    scheme: sphincs-shake256-256s-simple
+    implementation: clean
+  files:
+    - thash_shake256_simple.c