diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7bca81371..9b4e9d08b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -119,7 +119,8 @@ jobs:
       - run:
           working_directory: wasm
           command: |
-            cargo clippy
+            cargo clippy --features testnet
+            cargo clippy --features mainnet
 
   check-fmt:
     executor: rust-node
diff --git a/sdk/tests/account.test.ts b/sdk/tests/account.test.ts
index 3d3ae9bb3..61affe26e 100644
--- a/sdk/tests/account.test.ts
+++ b/sdk/tests/account.test.ts
@@ -1,5 +1,5 @@
 import {jest} from '@jest/globals'
-import { Account, Address, PrivateKey, RecordCiphertext, ViewKey } from '../src/node'
+import { Account, Address, PrivateKey, RecordCiphertext, ViewKey } from '../src/testnet/node'
 import { seed, message, beaconPrivateKeyString, beaconViewKeyString, beaconAddressString, recordCiphertextString, foreignCiphertextString, recordPlaintextString } from './data/account-data';
 
 
diff --git a/sdk/tests/key-provider.test.ts b/sdk/tests/key-provider.test.ts
index 30acb20d8..b63854d71 100644
--- a/sdk/tests/key-provider.test.ts
+++ b/sdk/tests/key-provider.test.ts
@@ -1,4 +1,4 @@
-import {AleoKeyProvider, CachedKeyPair, CREDITS_PROGRAM_KEYS, FunctionKeyPair, OfflineKeyProvider, ProvingKey, VerifyingKey} from "../src/node";
+import {AleoKeyProvider, CachedKeyPair, CREDITS_PROGRAM_KEYS, FunctionKeyPair, OfflineKeyProvider, ProvingKey, VerifyingKey} from "../src/testnet/node";
 import {jest} from '@jest/globals'
 jest.retryTimes(1);
 
diff --git a/sdk/tests/network-client.test.ts b/sdk/tests/network-client.test.ts
index 2c442f317..07724d5cf 100644
--- a/sdk/tests/network-client.test.ts
+++ b/sdk/tests/network-client.test.ts
@@ -1,5 +1,5 @@
 import {jest} from '@jest/globals'
-import {Account, Block, AleoNetworkClient, TransactionModel} from "../src/node";
+import {Account, Block, AleoNetworkClient, TransactionModel} from "../src/testnet/node";
 import {beaconAddressString, beaconPrivateKeyString} from "./data/account-data";
 import {log} from "console";
 jest.retryTimes(3);
diff --git a/sdk/tests/program-manager.test.ts b/sdk/tests/program-manager.test.ts
index 721298b12..ddc5586f4 100644
--- a/sdk/tests/program-manager.test.ts
+++ b/sdk/tests/program-manager.test.ts
@@ -7,7 +7,7 @@ import {
     statePathRecordOwnerPrivateKey,
     stateRoot
 } from "./data/account-data";
-import { Account, ExecutionResponse, OfflineQuery, ProgramManager, RecordPlaintext } from "../src/node";
+import { Account, ExecutionResponse, OfflineQuery, ProgramManager, RecordPlaintext } from "../src/testnet/node";
 jest.retryTimes(3);
 
 describe('Program Manager', () => {
@@ -41,4 +41,4 @@ describe('Program Manager', () => {
             // TODO
         }, 420000);
     });
-});
\ No newline at end of file
+});
diff --git a/sdk/tests/record-provider.test.ts b/sdk/tests/record-provider.test.ts
index afe810939..908f35289 100644
--- a/sdk/tests/record-provider.test.ts
+++ b/sdk/tests/record-provider.test.ts
@@ -1,5 +1,5 @@
 import {jest} from '@jest/globals'
-import {Account, AleoNetworkClient, BlockHeightSearch, NetworkRecordProvider} from "../src/node";
+import {Account, AleoNetworkClient, BlockHeightSearch, NetworkRecordProvider} from "../src/testnet/node";
 import {beaconPrivateKeyString} from "./data/account-data";
 import {log} from "console";
 jest.retryTimes(3);
diff --git a/sdk/tests/wasm.test.ts b/sdk/tests/wasm.test.ts
index 560031556..e59ec92d0 100644
--- a/sdk/tests/wasm.test.ts
+++ b/sdk/tests/wasm.test.ts
@@ -1,4 +1,4 @@
-import { Address, PrivateKey, ViewKey, Signature, RecordCiphertext, RecordPlaintext, PrivateKeyCiphertext } from "../src/node";
+import { Address, PrivateKey, ViewKey, Signature, RecordCiphertext, RecordPlaintext, PrivateKeyCiphertext } from "../src/testnet/node";
 import {
     seed,
     message,