diff --git a/src.ts/_tests/test-hash.ts b/src.ts/_tests/test-hash.ts
index 03ec92034..c30b45940 100644
--- a/src.ts/_tests/test-hash.ts
+++ b/src.ts/_tests/test-hash.ts
@@ -2,34 +2,38 @@ import assert from "assert";
 
 import {
     hashMessage,
+    namehash, isValidName,
     solidityPacked, solidityPackedKeccak256, solidityPackedSha256,
     isError
 } from "../index.js";
 
 import { loadTests } from "./utils.js"
 
-import type { TestCaseSolidityHash } from "./types.js";
+import type { TestCaseNamehash, TestCaseSolidityHash } from "./types.js";
 
-/*
 
-import { dnsEncode, isValidName, namehash } from "../index.js";
+//import { dnsEncode, isValidName, namehash } from "../index.js";
 
 describe("Tests Namehash", function() {
     const tests = loadTests<TestCaseNamehash>("namehash");
     for (const test of tests) {
-        it(`hashes ENS names: ${ JSON.stringify(test.ensName) }`, function() {
-            const actual = namehash(test.ensName);
+        if (test.error) {
+        } else {
+            it(`hashes ENS name: ${ JSON.stringify(test.name) }`, function() {
+                const actual = namehash(test.ensName);
 
-            assert.equal(actual, test.namehash, "namehash");
+                assert.equal(actual, test.namehash, "namehash");
 
-            // The empty string is not a valid ENS name
-            if (test.ensName) {
-                assert.ok(isValidName(test.ensName), "isValidName");
-            }
-        });
+                // The empty string is not a valid ENS name
+                if (test.ensName) {
+                    assert.ok(isValidName(test.ensName), "isValidName");
+                }
+            });
+        }
     }
 });
 
+/*
 describe("Tests Bad ENS Names", function() {
     const badTests: Array<{ ensName: any, prefix: string }> = [
         { ensName: ".", prefix: "missing component" },
diff --git a/src.ts/_tests/types.ts b/src.ts/_tests/types.ts
index bb6800b18..fd24e25de 100644
--- a/src.ts/_tests/types.ts
+++ b/src.ts/_tests/types.ts
@@ -107,7 +107,8 @@ export interface TestCaseHash {
 export interface TestCaseNamehash {
     name: string;
     ensName: string;
-    namehash: string;
+    error?: string;
+    namehash?: string;
 }
 
 export interface TestCaseTypedDataDomain {
diff --git a/testcases/namehash.json.gz b/testcases/namehash.json.gz
index 4f1b2e9aa..8a656fd98 100644
Binary files a/testcases/namehash.json.gz and b/testcases/namehash.json.gz differ