diff --git a/packages/types-codec/src/base/Enum.spec.ts b/packages/types-codec/src/base/Enum.spec.ts
index 1d51572e37..6da1eeb108 100644
--- a/packages/types-codec/src/base/Enum.spec.ts
+++ b/packages/types-codec/src/base/Enum.spec.ts
@@ -305,6 +305,7 @@ describe('Enum', (): void => {
             '0x0134120000'
           ).inspect()
         ).toEqual({
+          inner: undefined,
           outer: [new Uint8Array([0x01]), new Uint8Array([0x34, 0x12, 0x00, 0x00])]
         });
       });
diff --git a/packages/types-codec/src/base/Option.spec.ts b/packages/types-codec/src/base/Option.spec.ts
index c0f4f86309..7459f92a53 100644
--- a/packages/types-codec/src/base/Option.spec.ts
+++ b/packages/types-codec/src/base/Option.spec.ts
@@ -200,6 +200,7 @@ describe('Option', (): void => {
       expect(
         new Option(registry, U32, '1234').inspect()
       ).toEqual({
+        inner: undefined,
         outer: [new Uint8Array([0x01]), new Uint8Array([210, 4, 0, 0])]
       });
     });
diff --git a/packages/types-codec/src/native/Struct.spec.ts b/packages/types-codec/src/native/Struct.spec.ts
index 6ac3eaa77e..4aff8fe838 100644
--- a/packages/types-codec/src/native/Struct.spec.ts
+++ b/packages/types-codec/src/native/Struct.spec.ts
@@ -392,6 +392,7 @@ describe('Struct', (): void => {
             outer: [new Uint8Array([1 << 2]), new Uint8Array([0x99])]
           },
           {
+            inner: undefined,
             name: 'bar',
             outer: [new Uint8Array([1]), new Uint8Array([1, 0, 0, 0])]
           },
diff --git a/packages/types-create/src/util/getTypeDef.spec.ts b/packages/types-create/src/util/getTypeDef.spec.ts
index 87860377b3..029f0cf589 100644
--- a/packages/types-create/src/util/getTypeDef.spec.ts
+++ b/packages/types-create/src/util/getTypeDef.spec.ts
@@ -9,7 +9,9 @@ describe('getTypeDef', (): void => {
     expect(
       getTypeDef('()')
     ).toEqual({
+      displayName: undefined,
       info: TypeDefInfo.Tuple,
+      name: undefined,
       sub: [],
       type: '()'
     });
@@ -19,14 +21,20 @@ describe('getTypeDef', (): void => {
     expect(
       getTypeDef('BTreeMap<u32, Text>')
     ).toEqual({
+      displayName: undefined,
       info: TypeDefInfo.BTreeMap,
+      name: undefined,
       sub: [
         {
+          displayName: undefined,
           info: TypeDefInfo.Plain,
+          name: undefined,
           type: 'u32'
         },
         {
+          displayName: undefined,
           info: TypeDefInfo.Plain,
+          name: undefined,
           type: 'Text'
         }
       ],
@@ -38,9 +46,13 @@ describe('getTypeDef', (): void => {
     expect(
       getTypeDef('BTreeSet<Text>')
     ).toEqual({
+      displayName: undefined,
       info: TypeDefInfo.BTreeSet,
+      name: undefined,
       sub: {
+        displayName: undefined,
         info: TypeDefInfo.Plain,
+        name: undefined,
         type: 'Text'
       },
       type: 'BTreeSet<Text>'
@@ -51,14 +63,20 @@ describe('getTypeDef', (): void => {
     expect(
       getTypeDef('Result<u32, Text>')
     ).toEqual({
+      displayName: undefined,
       info: TypeDefInfo.Result,
+      name: undefined,
       sub: [
         {
+          displayName: undefined,
           info: TypeDefInfo.Plain,
+          name: undefined,
           type: 'u32'
         },
         {
+          displayName: undefined,
           info: TypeDefInfo.Plain,
+          name: undefined,
           type: 'Text'
         }
       ],
@@ -70,24 +88,34 @@ describe('getTypeDef', (): void => {
     expect(
       getTypeDef('Result<Result<Null,u32>,Text>')
     ).toEqual({
+      displayName: undefined,
       info: TypeDefInfo.Result,
+      name: undefined,
       sub: [
         {
+          displayName: undefined,
           info: TypeDefInfo.Result,
+          name: undefined,
           sub: [
             {
+              displayName: undefined,
               info: TypeDefInfo.Plain,
+              name: undefined,
               type: 'Null'
             },
             {
+              displayName: undefined,
               info: TypeDefInfo.Plain,
+              name: undefined,
               type: 'u32'
             }
           ],
           type: 'Result<Null,u32>'
         },
         {
+          displayName: undefined,
           info: TypeDefInfo.Plain,
+          name: undefined,
           type: 'Text'
         }
       ],
@@ -99,54 +127,82 @@ describe('getTypeDef', (): void => {
     expect(
       getTypeDef('(u32, Compact<u32>, Vec<u64>, Option<u128>, (Text,Vec<(Bool,u128)>))')
     ).toEqual({
+      displayName: undefined,
       info: TypeDefInfo.Tuple,
+      name: undefined,
       sub: [
         {
+          displayName: undefined,
           info: TypeDefInfo.Plain,
+          name: undefined,
           type: 'u32'
         },
         {
+          displayName: undefined,
           info: TypeDefInfo.Compact,
+          name: undefined,
           sub: {
+            displayName: undefined,
             info: TypeDefInfo.Plain,
+            name: undefined,
             type: 'u32'
           },
           type: 'Compact<u32>'
         },
         {
+          displayName: undefined,
           info: TypeDefInfo.Vec,
+          name: undefined,
           sub: {
+            displayName: undefined,
             info: TypeDefInfo.Plain,
+            name: undefined,
             type: 'u64'
           },
           type: 'Vec<u64>'
         },
         {
+          displayName: undefined,
           info: TypeDefInfo.Option,
+          name: undefined,
           sub: {
+            displayName: undefined,
             info: TypeDefInfo.Plain,
+            name: undefined,
             type: 'u128'
           },
           type: 'Option<u128>'
         },
         {
+          displayName: undefined,
           info: TypeDefInfo.Tuple,
+          name: undefined,
           sub: [
             {
+              displayName: undefined,
               info: TypeDefInfo.Plain,
+              name: undefined,
               type: 'Text'
             },
             {
+              displayName: undefined,
               info: TypeDefInfo.Vec,
+              name: undefined,
               sub: {
+                displayName: undefined,
                 info: TypeDefInfo.Tuple,
+                name: undefined,
                 sub: [
                   {
+                    displayName: undefined,
                     info: TypeDefInfo.Plain,
+                    name: undefined,
                     type: 'Bool'
                   },
                   {
+                    displayName: undefined,
                     info: TypeDefInfo.Plain,
+                    name: undefined,
                     type: 'u128'
                   }
                 ],
@@ -166,20 +222,30 @@ describe('getTypeDef', (): void => {
     expect(
       getTypeDef('Vec<(Box<PropIndex>, Proposal,Lookup::Target)>')
     ).toEqual({
+      displayName: undefined,
       info: TypeDefInfo.Vec,
+      name: undefined,
       sub: {
+        displayName: undefined,
         info: TypeDefInfo.Tuple,
+        name: undefined,
         sub: [
           {
+            displayName: undefined,
             info: TypeDefInfo.Plain,
+            name: undefined,
             type: 'PropIndex'
           },
           {
+            displayName: undefined,
             info: TypeDefInfo.Plain,
+            name: undefined,
             type: 'Proposal'
           },
           {
+            displayName: undefined,
             info: TypeDefInfo.Plain,
+            name: undefined,
             type: 'LookupTarget'
           }
         ],
@@ -193,20 +259,30 @@ describe('getTypeDef', (): void => {
     expect(
       getTypeDef('Vec<(PropIndex, Proposal, AccountId)>')
     ).toEqual({
+      displayName: undefined,
       info: TypeDefInfo.Vec,
+      name: undefined,
       sub: {
+        displayName: undefined,
         info: TypeDefInfo.Tuple,
+        name: undefined,
         sub: [
           {
+            displayName: undefined,
             info: TypeDefInfo.Plain,
+            name: undefined,
             type: 'PropIndex'
           },
           {
+            displayName: undefined,
             info: TypeDefInfo.Plain,
+            name: undefined,
             type: 'Proposal'
           },
           {
+            displayName: undefined,
             info: TypeDefInfo.Plain,
+            name: undefined,
             type: 'AccountId'
           }
         ],
@@ -220,28 +296,39 @@ describe('getTypeDef', (): void => {
     expect(
       getTypeDef('{"balance":"Balance","account_id":"AccountId","log":"(u64, Signature)"}')
     ).toEqual({
+      alias: undefined,
+      displayName: undefined,
+      fallbackType: undefined,
       info: TypeDefInfo.Struct,
+      name: undefined,
       sub: [
         {
+          displayName: undefined,
           info: TypeDefInfo.Plain,
           name: 'balance',
           type: 'Balance'
         },
         {
+          displayName: undefined,
           info: TypeDefInfo.Plain,
           name: 'account_id',
           type: 'AccountId'
         },
         {
+          displayName: undefined,
           info: TypeDefInfo.Tuple,
           name: 'log',
           sub: [
             {
+              displayName: undefined,
               info: TypeDefInfo.Plain,
+              name: undefined,
               type: 'u64'
             },
             {
+              displayName: undefined,
               info: TypeDefInfo.Plain,
+              name: undefined,
               type: 'Signature'
             }
           ],
@@ -256,16 +343,24 @@ describe('getTypeDef', (): void => {
     expect(
       getTypeDef('[[[bool; 3]; 6]; 9]')
     ).toEqual({
+      displayName: undefined,
       info: TypeDefInfo.VecFixed,
       length: 9,
+      name: undefined,
       sub: {
+        displayName: undefined,
         info: TypeDefInfo.VecFixed,
         length: 6,
+        name: undefined,
         sub: {
+          displayName: undefined,
           info: TypeDefInfo.VecFixed,
           length: 3,
+          name: undefined,
           sub: {
+            displayName: undefined,
             info: TypeDefInfo.Plain,
+            name: undefined,
             type: 'bool'
           },
           type: '[bool;3]'
@@ -283,11 +378,16 @@ describe('getTypeDef', (): void => {
       displayName: 'MyType',
       info: TypeDefInfo.VecFixed,
       length: 3,
+      name: undefined,
       sub: {
+        displayName: undefined,
         info: TypeDefInfo.VecFixed,
         length: 6,
+        name: undefined,
         sub: {
+          displayName: undefined,
           info: TypeDefInfo.Plain,
+          name: undefined,
           type: 'bool'
         },
         type: '[bool;6]'
@@ -300,24 +400,34 @@ describe('getTypeDef', (): void => {
     expect(
       getTypeDef('((u32, u64), u128)')
     ).toEqual({
+      displayName: undefined,
       info: TypeDefInfo.Tuple,
+      name: undefined,
       sub: [
         {
+          displayName: undefined,
           info: TypeDefInfo.Tuple,
+          name: undefined,
           sub: [
             {
+              displayName: undefined,
               info: TypeDefInfo.Plain,
+              name: undefined,
               type: 'u32'
             },
             {
+              displayName: undefined,
               info: TypeDefInfo.Plain,
+              name: undefined,
               type: 'u64'
             }
           ],
           type: '(u32,u64)'
         },
         {
+          displayName: undefined,
           info: TypeDefInfo.Plain,
+          name: undefined,
           type: 'u128'
         }
       ],
@@ -338,41 +448,55 @@ describe('getTypeDef', (): void => {
         }
       }))
     ).toEqual({
+      displayName: undefined,
+      fallbackType: undefined,
       info: TypeDefInfo.Enum,
+      name: undefined,
       sub: [
         {
+          displayName: undefined,
           index: 0,
           info: TypeDefInfo.Plain,
           name: 'A',
           type: 'u32'
         },
         {
+          displayName: undefined,
           index: 1,
           info: TypeDefInfo.Tuple,
           name: 'B',
           sub: [
             {
+              displayName: undefined,
               info: TypeDefInfo.Plain,
+              name: undefined,
               type: 'u32'
             },
             {
+              displayName: undefined,
               info: TypeDefInfo.Plain,
+              name: undefined,
               type: 'bool'
             }
           ],
           type: '(u32,bool)'
         },
         {
+          alias: undefined,
+          displayName: undefined,
+          fallbackType: undefined,
           index: 2,
           info: TypeDefInfo.Struct,
           name: 'C',
           sub: [
             {
+              displayName: undefined,
               info: TypeDefInfo.Plain,
               name: 'd',
               type: 'AccountId'
             },
             {
+              displayName: undefined,
               info: TypeDefInfo.Plain,
               name: 'e',
               type: 'Balance'
@@ -396,38 +520,53 @@ describe('getTypeDef', (): void => {
         }
       }))
     ).toEqual({
+      alias: undefined,
+      displayName: undefined,
+      fallbackType: undefined,
       info: TypeDefInfo.Struct,
+      name: undefined,
       sub: [
         {
+          displayName: undefined,
           info: TypeDefInfo.Plain,
           name: 'a',
           type: 'u32'
         },
         {
+          displayName: undefined,
           info: TypeDefInfo.Tuple,
           name: 'b',
           sub: [
             {
+              displayName: undefined,
               info: TypeDefInfo.Plain,
+              name: undefined,
               type: 'u32'
             },
             {
+              displayName: undefined,
               info: TypeDefInfo.Plain,
+              name: undefined,
               type: 'bool'
             }
           ],
           type: '(u32,bool)'
         },
         {
+          alias: undefined,
+          displayName: undefined,
+          fallbackType: undefined,
           info: TypeDefInfo.Struct,
           name: 'c',
           sub: [
             {
+              displayName: undefined,
               info: TypeDefInfo.Plain,
               name: 'd',
               type: 'AccountId'
             },
             {
+              displayName: undefined,
               info: TypeDefInfo.Plain,
               name: 'e',
               type: 'Balance'
@@ -444,18 +583,28 @@ describe('getTypeDef', (): void => {
     expect(
       getTypeDef('Vec<[[[bool; 3]; 6]; 9]>')
     ).toEqual({
+      displayName: undefined,
       info: TypeDefInfo.Vec,
+      name: undefined,
       sub: {
+        displayName: undefined,
         info: TypeDefInfo.VecFixed,
         length: 9,
+        name: undefined,
         sub: {
+          displayName: undefined,
           info: TypeDefInfo.VecFixed,
           length: 6,
+          name: undefined,
           sub: {
+            displayName: undefined,
             info: TypeDefInfo.VecFixed,
             length: 3,
+            name: undefined,
             sub: {
+              displayName: undefined,
               info: TypeDefInfo.Plain,
+              name: undefined,
               type: 'bool'
             },
             type: '[bool;3]'
@@ -472,25 +621,37 @@ describe('getTypeDef', (): void => {
     expect(
       getTypeDef('Vec<{ "a": "u32", "b": "(u32, bool)" }>')
     ).toEqual({
+      displayName: undefined,
       info: TypeDefInfo.Vec,
+      name: undefined,
       sub: {
+        alias: undefined,
+        displayName: undefined,
+        fallbackType: undefined,
         info: TypeDefInfo.Struct,
+        name: undefined,
         sub: [
           {
+            displayName: undefined,
             info: TypeDefInfo.Plain,
             name: 'a',
             type: 'u32'
           },
           {
+            displayName: undefined,
             info: TypeDefInfo.Tuple,
             name: 'b',
             sub: [
               {
+                displayName: undefined,
                 info: TypeDefInfo.Plain,
+                name: undefined,
                 type: 'u32'
               },
               {
+                displayName: undefined,
                 info: TypeDefInfo.Plain,
+                name: undefined,
                 type: 'bool'
               }
             ],
@@ -517,12 +678,19 @@ describe('getTypeDef', (): void => {
     expect(
       getTypeDef(raw)
     ).toEqual({
+      alias: undefined,
+      displayName: undefined,
+      fallbackType: undefined,
       info: TypeDefInfo.Struct,
+      name: undefined,
       sub: [{
+        displayName: undefined,
         info: TypeDefInfo.Vec,
         name: 'data',
         sub: {
+          displayName: undefined,
           info: TypeDefInfo.Plain,
+          name: undefined,
           type: 'Recursive'
         },
         type: 'Vec<Recursive>'
diff --git a/packages/types/src/create/createType.spec.ts b/packages/types/src/create/createType.spec.ts
index 6bc7107d96..f2314c6e62 100644
--- a/packages/types/src/create/createType.spec.ts
+++ b/packages/types/src/create/createType.spec.ts
@@ -100,7 +100,7 @@ describe('createType', (): void => {
   it('fails creation for a UInt<bitLength> where bitLength is not power of 8', (): void => {
     expect(
       () => registry.createType('UInt<20>').toRawType()
-    ).toThrow('UInt<20>: Only support for UInt<bitLength>, where length <= 8192 and a power of 8');
+    ).toThrow(/UInt<20>: Only support for UInt<bitLength>, where length <= 8192 and a power of 8/);
   });
 
   it('fails on creation of DoNotConstruct', (): void => {
@@ -108,7 +108,7 @@ describe('createType', (): void => {
 
     expect(
       () => new Clazz(registry)
-    ).toThrow('Cannot construct unknown type UnknownSomething');
+    ).toThrow(/Cannot construct unknown type UnknownSomething/);
   });
 
   it('allows creation of a [u8; 8]', (): void => {
diff --git a/packages/types/src/create/registry.spec.ts b/packages/types/src/create/registry.spec.ts
index 5ca208e0a7..8730454f68 100644
--- a/packages/types/src/create/registry.spec.ts
+++ b/packages/types/src/create/registry.spec.ts
@@ -15,7 +15,7 @@ describe('TypeRegistry', (): void => {
   const registry = new TypeRegistry();
 
   it('handles non exist type', (): void => {
-    expect(registry.get('non-exist')).toBeUndefined();
+    expect(registry.get('non-exist')).not.toBeDefined();
   });
 
   it('throws on non-existent via getOrThrow', (): void => {