diff --git a/libraries/Crypto/Crypto.test.ts b/libraries/Crypto/Crypto.test.ts
index 7fa442755c..db7e1cfec0 100644
--- a/libraries/Crypto/Crypto.test.ts
+++ b/libraries/Crypto/Crypto.test.ts
@@ -183,11 +183,11 @@ describe('Crypto.default.isInitialized', () => {
   let inst: any
 
   beforeEach(() => {
-    inst = new Crypto.default()
+    inst = new CryptoDefault()
   })
 
   test('0', () => {
     const result: any = inst.isInitialized()
     expect(result).toMatchSnapshot()
   })
-})
\ No newline at end of file
+})
diff --git a/libraries/Solana/SolanaManager/SolanaManager.test.ts b/libraries/Solana/SolanaManager/SolanaManager.test.ts
index 1ce47e98a5..6a1bf232a9 100644
--- a/libraries/Solana/SolanaManager/SolanaManager.test.ts
+++ b/libraries/Solana/SolanaManager/SolanaManager.test.ts
@@ -305,15 +305,15 @@ describe('SolanaManager.default.generateDerivedPublicKey', () => {
   let inst2: any
 
   beforeEach(() => {
-    inst10 = new SolanaManager.default()
-    inst9 = new SolanaManager.default()
-    inst8 = new SolanaManager.default()
-    inst7 = new SolanaManager.default()
-    inst6 = new SolanaManager.default()
-    inst4 = new SolanaManager.default()
-    inst3 = new SolanaManager.default()
-    inst = new SolanaManager.default()
-    inst2 = new SolanaManager.default()
+    inst10 = new SolanaManagerDefault()
+    inst9 = new SolanaManagerDefault()
+    inst8 = new SolanaManagerDefault()
+    inst7 = new SolanaManagerDefault()
+    inst6 = new SolanaManagerDefault()
+    inst4 = new SolanaManagerDefault()
+    inst3 = new SolanaManagerDefault()
+    inst = new SolanaManagerDefault()
+    inst2 = new SolanaManagerDefault()
   })
 
   test('0', async () => {
@@ -342,7 +342,7 @@ describe('SolanaManager.default.generateDerivedPublicKey', () => {
     let inst2: any
 
     beforeEach(() => {
-      inst2 = new SolanaManager.default()
+      inst2 = new SolanaManagerDefault()
     })
 
     test('0', async () => {
@@ -354,7 +354,7 @@ describe('SolanaManager.default.generateDerivedPublicKey', () => {
     let inst2: any
 
     beforeEach(() => {
-      inst2 = new SolanaManager.default()
+      inst2 = new SolanaManagerDefault()
     })
 
     test('0', async () => {
@@ -366,7 +366,7 @@ describe('SolanaManager.default.generateDerivedPublicKey', () => {
     let inst2: any
 
     beforeEach(() => {
-      inst2 = new SolanaManager.default()
+      inst2 = new SolanaManagerDefault()
     })
 
     test('0', () => {
@@ -387,15 +387,15 @@ describe('SolanaManager.default.generateDerivedPublicKey', () => {
     let inst2: any
 
     beforeEach(() => {
-      inst9 = new SolanaManager.default()
-      inst8 = new SolanaManager.default()
-      inst7 = new SolanaManager.default()
-      inst6 = new SolanaManager.default()
-      inst5 = new SolanaManager.default()
-      inst4 = new SolanaManager.default()
-      inst3 = new SolanaManager.default()
-      inst = new SolanaManager.default()
-      inst2 = new SolanaManager.default()
+      inst9 = new SolanaManagerDefault()
+      inst8 = new SolanaManagerDefault()
+      inst7 = new SolanaManagerDefault()
+      inst6 = new SolanaManagerDefault()
+      inst5 = new SolanaManagerDefault()
+      inst4 = new SolanaManagerDefault()
+      inst3 = new SolanaManagerDefault()
+      inst = new SolanaManagerDefault()
+      inst2 = new SolanaManagerDefault()
     })
 
     test('0', async () => {
@@ -412,7 +412,7 @@ describe('SolanaManager.default.generateDerivedPublicKey', () => {
     let inst2: any
 
     beforeEach(() => {
-      inst2 = new SolanaManager.default()
+      inst2 = new SolanaManagerDefault()
     })
 
     test('0', () => {
@@ -427,9 +427,9 @@ describe('SolanaManager.default.generateDerivedPublicKey', () => {
     let inst2: any
 
     beforeEach(() => {
-      inst3 = new SolanaManager.default()
-      inst = new SolanaManager.default()
-      inst2 = new SolanaManager.default()
+      inst3 = new SolanaManagerDefault()
+      inst = new SolanaManagerDefault()
+      inst2 = new SolanaManagerDefault()
     })
 
     test('0', () => {