diff --git a/__tests__/defaultProvider.test.ts b/__tests__/defaultProvider.test.ts
index 8d86daa13..a6de6627c 100644
--- a/__tests__/defaultProvider.test.ts
+++ b/__tests__/defaultProvider.test.ts
@@ -1,11 +1,6 @@
-import { BlockNumber, DeployContractResponse, GetBlockResponse, stark } from '../src';
+import { BlockNumber, GetBlockResponse, stark } from '../src';
 import { toBN } from '../src/utils/number';
-import {
-  compiledOpenZeppelinAccount,
-  describeIfNotDevnet,
-  getERC20DeployPayload,
-  getTestProvider,
-} from './fixtures';
+import { getERC20DeployPayload, getTestProvider } from './fixtures';
 
 const { compileCalldata } = stark;
 
@@ -36,27 +31,47 @@ describe('defaultProvider', () => {
   });
 
   describe('endpoints', () => {
-    test(`getBlock(blockHash=undefined, blockNumber=${exampleBlockNumber})`, () => {
-      return expect(testProvider.getBlock(exampleBlockNumber)).resolves.not.toThrow();
+    test('deployContract()', () => {
+      expect(exampleContractAddress).toBeTruthy();
+      expect(exampleTransactionHash).toBeTruthy();
     });
 
-    test(`getBlock(blockHash=${exampleBlockHash}, blockNumber=undefined)`, () => {
-      return expect(testProvider.getBlock(exampleBlockHash)).resolves.not.toThrow();
-    });
-
-    test('getBlock(blockIdentifier=latest)', async () => {
-      expect(exampleBlock).not.toBeNull();
-
-      const { block_number, timestamp } = exampleBlock;
+    describe('getBlock', () => {
+      test('getBlock(blockIdentifier=latest)', async () => {
+        expect(exampleBlock).not.toBeNull();
+        const { block_number, timestamp } = exampleBlock;
+        expect(typeof block_number).toEqual('number');
+        return expect(typeof timestamp).toEqual('number');
+      });
 
-      expect(typeof block_number).toEqual('number');
+      test(`getBlock(blockHash=undefined, blockNumber=${exampleBlockNumber})`, async () => {
+        const block = await testProvider.getBlock(exampleBlockNumber);
+        expect(block).toHaveProperty('block_hash');
+        expect(block).toHaveProperty('parent_hash');
+        expect(block).toHaveProperty('block_number');
+        expect(block).toHaveProperty('status');
+        expect(block).toHaveProperty('new_root');
+        expect(block).toHaveProperty('timestamp');
+        expect(block).toHaveProperty('transactions');
+        expect(Array.isArray(block.transactions)).toBe(true);
+      });
 
-      return expect(typeof timestamp).toEqual('number');
-    });
+      test(`getBlock(blockHash=${exampleBlockHash}, blockNumber=undefined)`, async () => {
+        const block = await testProvider.getBlock(exampleBlockHash);
+        expect(block).toHaveProperty('block_hash');
+        expect(block).toHaveProperty('parent_hash');
+        expect(block).toHaveProperty('block_number');
+        expect(block).toHaveProperty('status');
+        expect(block).toHaveProperty('new_root');
+        expect(block).toHaveProperty('timestamp');
+        expect(block).toHaveProperty('transactions');
+        expect(Array.isArray(block.transactions)).toBe(true);
+      });
 
-    test('getBlock() -> { blockNumber }', async () => {
-      const block = await testProvider.getBlock('latest');
-      return expect(block).toHaveProperty('block_number');
+      test('getBlock() -> { blockNumber }', async () => {
+        const block = await testProvider.getBlock('latest');
+        return expect(block).toHaveProperty('block_number');
+      });
     });
 
     test('getNonce()', async () => {
@@ -64,6 +79,13 @@ describe('defaultProvider', () => {
       return expect(nonce).toEqual('0x0');
     });
 
+    test('getClassAt(contractAddress, blockNumber="latest")', async () => {
+      const classResponse = await testProvider.getClassAt(exampleContractAddress);
+
+      expect(classResponse).toHaveProperty('program');
+      expect(classResponse).toHaveProperty('entry_points_by_type');
+    });
+
     describe('getStorageAt', () => {
       test('with "key" type of number', () => {
         return expect(testProvider.getStorageAt(exampleContractAddress, 0)).resolves.not.toThrow();
@@ -82,7 +104,7 @@ describe('defaultProvider', () => {
       });
     });
 
-    test('getTransaction() - successful transaction', async () => {
+    test('getTransaction() - successful deploy transaction', async () => {
       const transaction = await testProvider.getTransaction(exampleTransactionHash);
 
       expect(transaction).toHaveProperty('transaction_hash');
@@ -91,198 +113,51 @@ describe('defaultProvider', () => {
     test('getTransactionReceipt() - successful transaction', async () => {
       const transactionReceipt = await testProvider.getTransactionReceipt(exampleTransactionHash);
 
-      return expect(transactionReceipt).toHaveProperty('actual_fee');
+      expect(transactionReceipt).toHaveProperty('actual_fee');
+      expect(transactionReceipt).toHaveProperty('transaction_hash');
+      expect(transactionReceipt).toHaveProperty('status');
+      expect(transactionReceipt).toHaveProperty('actual_fee');
     });
 
-    test('callContract()', () => {
-      return expect(
-        testProvider.callContract({
-          contractAddress: exampleContractAddress,
-          entrypoint: 'balanceOf',
-          calldata: compileCalldata({
-            user: '0x9ff64f4ab0e1fe88df4465ade98d1ea99d5732761c39279b8e1374fa943e9b',
-          }),
-        })
-      ).resolves.not.toThrow();
-    });
-
-    test('callContract() - gateway error', async () => {
-      return expect(
-        testProvider.callContract({
-          contractAddress: exampleContractAddress,
-          entrypoint: 'non_existent_entrypoint',
-          calldata: compileCalldata({
-            user: '0xdeadbeef',
-          }),
-        })
-      ).rejects.toThrowError();
-    });
-  });
-
-  describe('addTransaction()', () => {
-    test('deployContract()', async () => {
-      const response = await testProvider.deployContract({
-        contract: compiledOpenZeppelinAccount,
-      });
-
-      expect(response.transaction_hash).toBeDefined();
-      expect(response.contract_address).toBeDefined();
-    });
-  });
-
-  describeIfNotDevnet('Provider', () => {
-    const provider = getTestProvider();
-    let latestBlock;
-    describe(`Provider methods if not devnet`, () => {
-      describe('getBlock', () => {
-        test('getBlock by tag latest', async () => {
-          latestBlock = await provider.getBlock('latest');
-          expect(latestBlock).toHaveProperty('block_hash');
-          expect(latestBlock).toHaveProperty('parent_hash');
-          expect(latestBlock).toHaveProperty('block_number');
-          expect(latestBlock).toHaveProperty('status');
-          expect(latestBlock).toHaveProperty('new_root');
-          expect(latestBlock).toHaveProperty('timestamp');
-          expect(latestBlock).toHaveProperty('transactions');
-          expect(Array.isArray(latestBlock.transactions)).toBe(true);
-        });
-
-        test('getBlock by Hash', async () => {
-          const block = await provider.getBlock(latestBlock.block_hash);
-          expect(block).toHaveProperty('block_hash');
-          expect(block).toHaveProperty('parent_hash');
-          expect(block).toHaveProperty('block_number');
-          expect(block).toHaveProperty('status');
-          expect(block).toHaveProperty('new_root');
-          expect(block).toHaveProperty('timestamp');
-          expect(block).toHaveProperty('transactions');
-          expect(Array.isArray(block.transactions)).toBe(true);
-        });
-
-        test('getBlock by Number', async () => {
-          const block = await provider.getBlock(latestBlock.block_number);
-          expect(block).toHaveProperty('block_hash');
-          expect(block).toHaveProperty('parent_hash');
-          expect(block).toHaveProperty('block_number');
-          expect(block).toHaveProperty('status');
-          expect(block).toHaveProperty('new_root');
-          expect(block).toHaveProperty('timestamp');
-          expect(block).toHaveProperty('transactions');
-          expect(Array.isArray(block.transactions)).toBe(true);
-        });
-      });
-
-      describe('getStorageAt', () => {
-        test('pending', async () => {
-          const storage = await provider.getStorageAt(
-            '0x01d1f307c073bb786a66e6e042ec2a9bdc385a3373bb3738d95b966d5ce56166',
-            '0'
-          );
-          expect(typeof storage).toBe('string');
-        });
-
-        test('Block Hash 0x7104702055c2a5773a870ceada9552ec659d69c18053b14078983f07527dea8', async () => {
-          const storage = await provider.getStorageAt(
-            '0x01d1f307c073bb786a66e6e042ec2a9bdc385a3373bb3738d95b966d5ce56166',
-            '0',
-            '0x7225762c7ff5e7e5f0867f0a8e73594df4f44f05a65375339a76398e8ae3e64'
-          );
-          expect(typeof storage).toBe('string');
-        });
-      });
-
-      describe('getTransaction', () => {
-        test('Deploy Transaction Hash 0x37013e1cb9c133e6fe51b4b371b76b317a480f56d80576730754c1662582348', async () => {
-          const transaction = await provider.getTransaction(
-            '0x37013e1cb9c133e6fe51b4b371b76b317a480f56d80576730754c1662582348'
-          );
-
-          expect(transaction.transaction_hash).toBeTruthy();
-          expect(transaction.contract_address).toBeTruthy();
-        });
-
-        test('Invoke Transaction Hash 0x2a56c636f45761c99a67ecdf0f185a6d5fe5239924ed9a4886fddbfaf3227b', async () => {
-          const transaction = await provider.getTransaction(
-            '0x2a56c636f45761c99a67ecdf0f185a6d5fe5239924ed9a4886fddbfaf3227b'
-          );
-
-          expect(transaction.transaction_hash).toBeTruthy();
-          expect(transaction.contract_address).toBeTruthy();
-          expect(Array.isArray(transaction.calldata)).toBe(true);
-          // expect(transaction.entry_point_selector).toBeTruthy();
-          expect(Array.isArray(transaction.signature)).toBe(true);
-          expect(transaction.max_fee).toBeTruthy();
-        });
-
-        test('Declare Transaction Hash 0x79b130f2e808db6ab4b83f0182f016a128d73752b849e5b0221c2b3a35a87ea', async () => {
-          const transaction = await provider.getTransaction(
-            '0x79b130f2e808db6ab4b83f0182f016a128d73752b849e5b0221c2b3a35a87ea'
-          );
-
-          expect(transaction.max_fee).toBeTruthy();
-          expect(transaction.transaction_hash).toBeTruthy();
-          expect(transaction).toHaveProperty('nonce');
-          expect(transaction).toHaveProperty('version');
-        });
+    describe('callContract()', () => {
+      test('callContract()', () => {
+        return expect(
+          testProvider.callContract({
+            contractAddress: exampleContractAddress,
+            entrypoint: 'balanceOf',
+            calldata: compileCalldata({
+              user: '0x9ff64f4ab0e1fe88df4465ade98d1ea99d5732761c39279b8e1374fa943e9b',
+            }),
+          })
+        ).resolves.not.toThrow();
       });
 
-      describe('getTransactionReceipt', () => {
-        test('Transaction Hash 0x37013e1cb9c133e6fe51b4b371b76b317a480f56d80576730754c1662582348', async () => {
-          const receipt = await provider.getTransactionReceipt(
-            '0x37013e1cb9c133e6fe51b4b371b76b317a480f56d80576730754c1662582348'
-          );
-          expect(receipt).toHaveProperty('transaction_hash');
-          expect(receipt).toHaveProperty('status');
-          expect(receipt).toHaveProperty('actual_fee');
-        });
+      test('callContract() - user wallet', () => {
+        return expect(
+          testProvider
+            .callContract({
+              contractAddress: exampleContractAddress,
+              entrypoint: 'balanceOf',
+              calldata: compileCalldata({
+                user: wallet,
+              }),
+            })
+            .then((res) => {
+              expect(Array.isArray(res.result)).toBe(true);
+            })
+        ).resolves.not.toThrow();
       });
 
-      describe('Contract methods', () => {
-        let contractAddress: string;
-        let deployResponse: DeployContractResponse;
-        let blockNumber: BlockNumber;
-
-        beforeAll(async () => {
-          const erc20DeployPayload = getERC20DeployPayload(wallet);
-          deployResponse = await provider.deployContract(erc20DeployPayload);
-          contractAddress = deployResponse.contract_address;
-          await provider.waitForTransaction(deployResponse.transaction_hash);
-          ({ block_number: blockNumber } = await provider.getBlock('latest'));
-        });
-
-        describe('deployContract', () => {
-          test('response', () => {
-            expect(deployResponse.contract_address).toBeTruthy();
-            expect(deployResponse.transaction_hash).toBeTruthy();
-          });
-        });
-
-        describe('getClassAt', () => {
-          test('response', async () => {
-            const classResponse = await provider.getClassAt(contractAddress, blockNumber);
-
-            expect(classResponse).toHaveProperty('program');
-            expect(classResponse).toHaveProperty('entry_points_by_type');
-          });
-        });
-
-        describe('callContract', () => {
-          test('result', () => {
-            return expect(
-              provider
-                .callContract({
-                  contractAddress: deployResponse.contract_address,
-                  entrypoint: 'balanceOf',
-                  calldata: compileCalldata({
-                    user: wallet,
-                  }),
-                })
-                .then((res) => {
-                  expect(Array.isArray(res.result)).toBe(true);
-                })
-            ).resolves.not.toThrow();
-          });
-        });
+      test('callContract() - gateway error', async () => {
+        return expect(
+          testProvider.callContract({
+            contractAddress: exampleContractAddress,
+            entrypoint: 'non_existent_entrypoint',
+            calldata: compileCalldata({
+              user: '0xdeadbeef',
+            }),
+          })
+        ).rejects.toThrowError();
       });
     });
   });
diff --git a/src/provider/rpc.ts b/src/provider/rpc.ts
index 78ab43c4b..f5633b7ef 100644
--- a/src/provider/rpc.ts
+++ b/src/provider/rpc.ts
@@ -200,7 +200,7 @@ export class RpcProvider implements ProviderInterface {
 
   public async getClassAt(
     contractAddress: string,
-    blockIdentifier: BlockIdentifier
+    blockIdentifier: BlockIdentifier = 'pending'
   ): Promise<RPC.ContractClass> {
     const block_id = new Block(blockIdentifier).identifier;
     return this.fetchEndpoint('starknet_getClassAt', {