diff --git a/packages/types/src/metadata/util/testUtil.ts b/packages/types/src/metadata/test/testUtil.ts
similarity index 98%
rename from packages/types/src/metadata/util/testUtil.ts
rename to packages/types/src/metadata/test/testUtil.ts
index 96934d4..f13323b 100644
--- a/packages/types/src/metadata/util/testUtil.ts
+++ b/packages/types/src/metadata/test/testUtil.ts
@@ -7,8 +7,8 @@
 
 import type { Registry } from '@pezkuwi/types-codec/types';
 import type { HexString } from '@pezkuwi/util/types';
+import type { Check } from '../util/types.js';
 import type { MetaVersionAll } from '../versions.js';
-import type { Check } from './types.js';
 
 import fs from 'node:fs';
 
@@ -17,7 +17,7 @@ import { hexToU8a, stringCamelCase, stringify, u8aToHex } from '@pezkuwi/util';
 import { TypeRegistry } from '../../create/index.js';
 import { unwrapStorageSi, unwrapStorageType } from '../../util/index.js';
 import { Metadata } from '../Metadata.js';
-import { getUniqTypes } from './getUniqTypes.js';
+import { getUniqTypes } from '../util/getUniqTypes.js';
 
 interface MetadataJsonDef {
   lookup: unknown;
diff --git a/packages/types/src/metadata/v10/Metadata.spec.ts b/packages/types/src/metadata/v10/Metadata.spec.ts
index 5c5c0c3..10a5c4f 100644
--- a/packages/types/src/metadata/v10/Metadata.spec.ts
+++ b/packages/types/src/metadata/v10/Metadata.spec.ts
@@ -3,7 +3,7 @@
 
 import bizinikiwiData from '@pezkuwi/types-support/metadata/v10/bizinikiwi-hex';
 
-import { testMeta } from '../util/testUtil.js';
+import { testMeta } from '../test/testUtil.js';
 
 testMeta(10, {
   bizinikiwi: {
diff --git a/packages/types/src/metadata/v11/Metadata.spec.ts b/packages/types/src/metadata/v11/Metadata.spec.ts
index 3187ae1..4f88e27 100644
--- a/packages/types/src/metadata/v11/Metadata.spec.ts
+++ b/packages/types/src/metadata/v11/Metadata.spec.ts
@@ -3,7 +3,7 @@
 
 import bizinikiwiData from '@pezkuwi/types-support/metadata/v11/bizinikiwi-hex';
 
-import { testMeta } from '../util/testUtil.js';
+import { testMeta } from '../test/testUtil.js';
 
 testMeta(11, {
   bizinikiwi: {
diff --git a/packages/types/src/metadata/v12/Metadata.spec.ts b/packages/types/src/metadata/v12/Metadata.spec.ts
index e1a2f69..c616a94 100644
--- a/packages/types/src/metadata/v12/Metadata.spec.ts
+++ b/packages/types/src/metadata/v12/Metadata.spec.ts
@@ -3,7 +3,7 @@
 
 import bizinikiwiData from '@pezkuwi/types-support/metadata/v12/bizinikiwi-hex';
 
-import { testMeta } from '../util/testUtil.js';
+import { testMeta } from '../test/testUtil.js';
 
 testMeta(12, {
   bizinikiwi: {
diff --git a/packages/types/src/metadata/v13/Metadata.spec.ts b/packages/types/src/metadata/v13/Metadata.spec.ts
index 8538eda..ddd1de1 100644
--- a/packages/types/src/metadata/v13/Metadata.spec.ts
+++ b/packages/types/src/metadata/v13/Metadata.spec.ts
@@ -5,7 +5,7 @@ import bizinikiwiData from '@pezkuwi/types-support/metadata/v13/bizinikiwi-hex';
 import dicleData from '@pezkuwi/types-support/metadata/v13/dicle-hex';
 import pezkuwiData from '@pezkuwi/types-support/metadata/v13/pezkuwi-hex';
 
-import { testMeta } from '../util/testUtil.js';
+import { testMeta } from '../test/testUtil.js';
 
 testMeta(13, {
   bizinikiwi: {
diff --git a/packages/types/src/metadata/v14/Metadata.spec.ts b/packages/types/src/metadata/v14/Metadata.spec.ts
index 29cb55b..f69982c 100644
--- a/packages/types/src/metadata/v14/Metadata.spec.ts
+++ b/packages/types/src/metadata/v14/Metadata.spec.ts
@@ -5,7 +5,7 @@ import bizinikiwiData from '@pezkuwi/types-support/metadata/v14/bizinikiwi-hex';
 import dicleData from '@pezkuwi/types-support/metadata/v14/dicle-hex';
 import pezkuwiData from '@pezkuwi/types-support/metadata/v14/pezkuwi-hex';
 
-import { testMeta } from '../util/testUtil.js';
+import { testMeta } from '../test/testUtil.js';
 
 testMeta(14, {
   bizinikiwi: {
diff --git a/packages/types/src/metadata/v15/Metadata.spec.ts b/packages/types/src/metadata/v15/Metadata.spec.ts
index dbf77dd..35a3cf7 100644
--- a/packages/types/src/metadata/v15/Metadata.spec.ts
+++ b/packages/types/src/metadata/v15/Metadata.spec.ts
@@ -7,7 +7,7 @@ import bizinikiwiData from '@pezkuwi/types-support/metadata/v15/bizinikiwi-hex';
 import dicleData from '@pezkuwi/types-support/metadata/v15/dicle-hex';
 import pezkuwiData from '@pezkuwi/types-support/metadata/v15/pezkuwi-hex';
 
-import { testMeta } from '../util/testUtil.js';
+import { testMeta } from '../test/testUtil.js';
 
 testMeta(15, {
   'asset-hub-dicle': {
diff --git a/packages/types/src/metadata/v16/Metadata.spec.ts b/packages/types/src/metadata/v16/Metadata.spec.ts
index abeb82c..47943ad 100644
--- a/packages/types/src/metadata/v16/Metadata.spec.ts
+++ b/packages/types/src/metadata/v16/Metadata.spec.ts
@@ -7,7 +7,7 @@ import dicleData from '@pezkuwi/types-support/metadata/v16/dicle-hex';
 import pezkuwiData from '@pezkuwi/types-support/metadata/v16/pezkuwi-hex';*/
 import bizinikiwiData from '@pezkuwi/types-support/metadata/v16/bizinikiwi-hex';
 
-import { testMeta } from '../util/testUtil.js';
+import { testMeta } from '../test/testUtil.js';
 
 // TODO: Once MetadataV16 lands in an official release, pull the
 // latest metadata for each chain and update the tests
diff --git a/packages/types/src/metadata/v9/Metadata.spec.ts b/packages/types/src/metadata/v9/Metadata.spec.ts
index 693bfe6..373f5c2 100644
--- a/packages/types/src/metadata/v9/Metadata.spec.ts
+++ b/packages/types/src/metadata/v9/Metadata.spec.ts
@@ -3,7 +3,7 @@
 
 import bizinikiwiData from '@pezkuwi/types-support/metadata/v9/bizinikiwi-hex';
 
-import { testMeta } from '../util/testUtil.js';
+import { testMeta } from '../test/testUtil.js';
 
 testMeta(9, {
   bizinikiwi: {