diff --git a/coverage.json b/coverage.json
index 98d3b3f..c26366f 100644
--- a/coverage.json
+++ b/coverage.json
@@ -234,28 +234,28 @@
     }
   },
   "excluded_locations": [
-    "A.0000000000000001.NonFungibleToken",
+    "A.0000000000000002.FungibleToken",
     "A.0000000000000002.FungibleTokenMetadataViews",
-    "A.0000000000000001.FlowStorageFees",
-    "A.0000000000000001.FlowDKG",
-    "A.0000000000000001.FlowEpoch",
-    "A.0000000000000001.FlowStakingCollection",
-    "A.0000000000000003.FlowToken",
-    "I.Crypto",
     "A.0000000000000001.FlowClusterQC",
     "A.0000000000000001.FlowIDTableStaking",
-    "A.0000000000000001.ExampleNFT",
     "A.0000000000000001.NFTStorefront",
-    "A.0000000000000004.FlowFees",
-    "A.0000000000000001.LockedTokens",
-    "A.0000000000000001.ViewResolver",
-    "A.0000000000000002.FungibleToken",
-    "I.Test",
-    "A.0000000000000001.MetadataViews",
+    "I.Crypto",
     "A.0000000000000001.NodeVersionBeacon",
     "A.0000000000000001.FlowServiceAccount",
+    "A.0000000000000001.FlowDKG",
+    "A.0000000000000001.LockedTokens",
+    "A.0000000000000001.FlowStakingCollection",
+    "A.0000000000000001.ExampleNFT",
+    "I.Test",
     "A.0000000000000001.StakingProxy",
+    "A.0000000000000004.FlowFees",
+    "A.0000000000000001.FlowStorageFees",
+    "A.0000000000000001.FlowEpoch",
     "A.0000000000000001.NFTStorefrontV2",
-    "s.7465737400000000000000000000000000000000000000000000000000000000"
+    "s.7465737400000000000000000000000000000000000000000000000000000000",
+    "A.0000000000000003.FlowToken",
+    "A.0000000000000001.ViewResolver",
+    "A.0000000000000001.MetadataViews",
+    "A.0000000000000001.NonFungibleToken"
   ]
 }
\ No newline at end of file
diff --git a/flow.json b/flow.json
index 6d6af60..7cfc586 100644
--- a/flow.json
+++ b/flow.json
@@ -4,7 +4,6 @@
       "source": "./contracts/FungibleToken.cdc",
       "aliases": {
         "emulator": "0xee82856bf20e2aa6",
-        "testing": "0x0000000000000002",
         "testnet": "0x9a0766d93b6608b7",
         "mainnet": "0xf233dcee88fe0abe"
       }
@@ -37,8 +36,7 @@
     "PrivateReceiverForwarder": {
       "source": "./contracts/utility/PrivateReceiverForwarder.cdc",
       "aliases": {
-        "emulator": "0xf8d6e0586b0a20c7",
-        "testing": "0x0000000000000002"
+        "emulator": "0xf8d6e0586b0a20c7"
       }
     },
     "TokenForwarding": {
@@ -52,7 +50,6 @@
       "source": "./contracts/utility/NonFungibleToken.cdc",
       "aliases": {
         "emulator": "0xf8d6e0586b0a20c7",
-        "testing": "0x0000000000000001",
         "mainnet": "0x1d7e57aa55817448",
         "testnet": "0x631e88ae7f1d7c20"
       }
@@ -61,7 +58,6 @@
       "source": "./contracts/utility/MetadataViews.cdc",
       "aliases": {
         "emulator": "0xf8d6e0586b0a20c7",
-        "testing": "0x0000000000000001",
         "mainnet": "0x1d7e57aa55817448",
         "testnet": "0x631e88ae7f1d7c20"
       }
@@ -70,7 +66,6 @@
       "source": "./contracts/utility/FlowToken.cdc",
       "aliases": {
         "emulator": "0x0ae53cb6e3f42a79",
-        "testing": "0x0000000000000003",
         "testnet": "0x7e60df042a9c0868",
         "mainnet": "0x1654653399040a61"
       }
@@ -78,7 +73,6 @@
     "FiatToken": {
       "source": "./contracts/utility/USDC/FiatToken.cdc",
       "aliases": {
-        "testing": "0x0000000000000002",
         "testnet": "0xa983fecbed621163",
         "mainnet": "0x1654653399040a61"
       }
@@ -86,7 +80,6 @@
     "LostAndFound": {
       "source": "./contracts/utility/L&F/LostAndFound.cdc",
       "aliases": {
-        "testing": "0x0000000000000002",
         "testnet": "0xbe4635353f55bbd4",
         "mainnet": "0x473d6a2c37eab5be"
       }