diff --git a/simulator/__tests__/mtsp.test.ts b/simulator/__tests__/mtsp.test.ts
index b3d3e53..bb218d8 100644
--- a/simulator/__tests__/mtsp.test.ts
+++ b/simulator/__tests__/mtsp.test.ts
@@ -99,7 +99,7 @@ describe('MTSP tests', () => {
       account: ADDRESS,
       token_id: tokenId,
     };
-    const balance = mtsp.authorized_balances.get(balanceKey.toString());
+    const balance = mtsp.authorized_balances.get(JSON.stringify(balanceKey));
     expect(balance?.balance).toBe(BigInt(1000));
   });
 
@@ -126,14 +126,14 @@ describe('MTSP tests', () => {
       account: ADDRESS,
       token_id: tokenId,
     };
-    const balance = mtsp.authorized_balances.get(balanceKey.toString());
+    const balance = mtsp.authorized_balances.get(JSON.stringify(balanceKey));
     expect(balance?.balance).toBe(BigInt(1000));
 
     // Burn tokens
     mtsp.burn_public(tokenId, ADDRESS, BigInt(500));
 
     // Check the balance of the user
-    const updatedBalance = mtsp.authorized_balances.get(balanceKey.toString());
+    const updatedBalance = mtsp.authorized_balances.get(JSON.stringify(balanceKey));
     expect(updatedBalance?.balance).toBe(BigInt(500));
   });
 });
diff --git a/simulator/__tests__/pondo/oracle.test.ts b/simulator/__tests__/pondo/oracle.test.ts
index c368104..d5212b8 100644
--- a/simulator/__tests__/pondo/oracle.test.ts
+++ b/simulator/__tests__/pondo/oracle.test.ts
@@ -407,7 +407,8 @@ describe('Pondo oracle tests', () => {
       setUpRemoveDelegator(true, true, true, true, rank);
       const initialTopTen = oracleInstance.top_validators.get(BigInt('0'))!;
       const expectedTopTen = initialTopTen
-        .toSpliced(rank, 1)
+        .slice(0, rank) // Get the part before the rank
+        .concat(initialTopTen.slice(rank + 1)) // Skip the element at the rank
         .concat([ZERO_GROUP_ADDRESS]);
 
       oracleInstance.caller = 'reference delegator';
diff --git a/simulator/src/contracts/pondoProgramsIndex.ts b/simulator/src/contracts/pondoProgramsIndex.ts
index fecf143..c1ae07a 100644
--- a/simulator/src/contracts/pondoProgramsIndex.ts
+++ b/simulator/src/contracts/pondoProgramsIndex.ts
@@ -3,14 +3,14 @@ export { creditsProgram as credits } from "./credits";
 export { token_registryProgram as MTSP } from "./token_registry";
 
 export { pondo_protocolProgram as coreProtocol } from "./pondo_protocol";
-export { validator_oracleProgram as oracle } from "./validator_oracle";
+export { validator_oracleProgram as oracle } from "./pondo_oracle";
 export { reference_delegatorProgram as referenceDelegator } from "./reference_delegator";
 
-export { paleo_tokenProgram as pALEO } from "./paleo_token";
-export { pondo_protocol_tokenProgram as PNDO } from "./pondo_protocol_token";
+export { paleo_tokenProgram as pALEO } from "./pondo_staked_aleo_token";
+export { pondo_protocol_tokenProgram as PNDO } from "./pondo_token";
 
-export { delegator1Program as delegator1 } from "./delegator1";
-export { delegator2Program as delegator2 } from "./delegator2";
-export { delegator3Program as delegator3 } from "./delegator3";
-export { delegator4Program as delegator4 } from "./delegator4";
-export { delegator5Program as delegator5 } from "./delegator5";
+export { delegator1Program as delegator1 } from "./pondo_delegator1";
+export { delegator2Program as delegator2 } from "./pondo_delegator2";
+export { delegator3Program as delegator3 } from "./pondo_delegator3";
+export { delegator4Program as delegator4 } from "./pondo_delegator4";
+export { delegator5Program as delegator5 } from "./pondo_delegator5";
diff --git a/simulator/src/contracts/pondo_core_protocol.ts b/simulator/src/contracts/pondo_protocol.ts
similarity index 100%
rename from simulator/src/contracts/pondo_core_protocol.ts
rename to simulator/src/contracts/pondo_protocol.ts
diff --git a/simulator/src/contracts/multi_token_support_program.ts b/simulator/src/contracts/token_registry.ts
similarity index 99%
rename from simulator/src/contracts/multi_token_support_program.ts
rename to simulator/src/contracts/token_registry.ts
index ec3c951..43618fe 100644
--- a/simulator/src/contracts/multi_token_support_program.ts
+++ b/simulator/src/contracts/token_registry.ts
@@ -76,6 +76,10 @@ export class token_registryProgram {
   }
 
   finalize_initialize() {
+    // Check if the CREDITS_RESERVED_TOKEN_ID token has already been initialized
+    let already_initialized: boolean = this.registered_tokens.has(this.CREDITS_RESERVED_TOKEN_ID);
+    assert(already_initialized == false);
+
     // Initialize the CREDITS_RESERVED_TOKEN_ID token
     let credits_reserved_token: TokenMetadata = {
       token_id: this.CREDITS_RESERVED_TOKEN_ID,