diff --git a/typescript/infra/config/environments/mainnet2/testquerysender/addresses.json b/typescript/infra/config/environments/mainnet2/testquerysender/addresses.json
new file mode 100644
index 000000000..697b0d01a
--- /dev/null
+++ b/typescript/infra/config/environments/mainnet2/testquerysender/addresses.json
@@ -0,0 +1,26 @@
+{
+  "celo": {
+    "TestQuerySender": "0x8566F965f613cB47A5Bd59879d07186122590895"
+  },
+  "bsc": {
+    "TestQuerySender": "0x8566F965f613cB47A5Bd59879d07186122590895"
+  },
+  "avalanche": {
+    "TestQuerySender": "0x8566F965f613cB47A5Bd59879d07186122590895"
+  },
+  "polygon": {
+    "TestQuerySender": "0x8566F965f613cB47A5Bd59879d07186122590895"
+  },
+  "arbitrum": {
+    "TestQuerySender": "0x8566F965f613cB47A5Bd59879d07186122590895"
+  },
+  "optimism": {
+    "TestQuerySender": "0x8566F965f613cB47A5Bd59879d07186122590895"
+  },
+  "ethereum": {
+    "TestQuerySender": "0x8566F965f613cB47A5Bd59879d07186122590895"
+  },
+  "moonbeam": {
+    "TestQuerySender": "0x8566F965f613cB47A5Bd59879d07186122590895"
+  }
+}
diff --git a/typescript/infra/config/environments/mainnet2/testquerysender/verification.json b/typescript/infra/config/environments/mainnet2/testquerysender/verification.json
new file mode 100644
index 000000000..72b805bd9
--- /dev/null
+++ b/typescript/infra/config/environments/mainnet2/testquerysender/verification.json
@@ -0,0 +1,66 @@
+{
+  "celo": [
+    {
+      "name": "TestQuerySender",
+      "address": "0x8566F965f613cB47A5Bd59879d07186122590895",
+      "isProxy": false,
+      "constructorArguments": "0x"
+    }
+  ],
+  "bsc": [
+    {
+      "name": "TestQuerySender",
+      "address": "0x8566F965f613cB47A5Bd59879d07186122590895",
+      "isProxy": false,
+      "constructorArguments": "0x"
+    }
+  ],
+  "avalanche": [
+    {
+      "name": "TestQuerySender",
+      "address": "0x8566F965f613cB47A5Bd59879d07186122590895",
+      "isProxy": false,
+      "constructorArguments": "0x"
+    }
+  ],
+  "polygon": [
+    {
+      "name": "TestQuerySender",
+      "address": "0x8566F965f613cB47A5Bd59879d07186122590895",
+      "isProxy": false,
+      "constructorArguments": "0x"
+    }
+  ],
+  "arbitrum": [
+    {
+      "name": "TestQuerySender",
+      "address": "0x8566F965f613cB47A5Bd59879d07186122590895",
+      "isProxy": false,
+      "constructorArguments": "0x"
+    }
+  ],
+  "optimism": [
+    {
+      "name": "TestQuerySender",
+      "address": "0x8566F965f613cB47A5Bd59879d07186122590895",
+      "isProxy": false,
+      "constructorArguments": "0x"
+    }
+  ],
+  "ethereum": [
+    {
+      "name": "TestQuerySender",
+      "address": "0x8566F965f613cB47A5Bd59879d07186122590895",
+      "isProxy": false,
+      "constructorArguments": "0x"
+    }
+  ],
+  "moonbeam": [
+    {
+      "name": "TestQuerySender",
+      "address": "0x8566F965f613cB47A5Bd59879d07186122590895",
+      "isProxy": false,
+      "constructorArguments": "0x"
+    }
+  ]
+}
diff --git a/typescript/infra/config/environments/testnet3/testquerysender/addresses.json b/typescript/infra/config/environments/testnet3/testquerysender/addresses.json
new file mode 100644
index 000000000..124b30144
--- /dev/null
+++ b/typescript/infra/config/environments/testnet3/testquerysender/addresses.json
@@ -0,0 +1,26 @@
+{
+  "alfajores": {
+    "TestQuerySender": "0x96D7D6Eba6C635e3EaC12b593Ef8B2eE1F6E6683"
+  },
+  "fuji": {
+    "TestQuerySender": "0x96D7D6Eba6C635e3EaC12b593Ef8B2eE1F6E6683"
+  },
+  "mumbai": {
+    "TestQuerySender": "0x96D7D6Eba6C635e3EaC12b593Ef8B2eE1F6E6683"
+  },
+  "bsctestnet": {
+    "TestQuerySender": "0x96D7D6Eba6C635e3EaC12b593Ef8B2eE1F6E6683"
+  },
+  "goerli": {
+    "TestQuerySender": "0x96D7D6Eba6C635e3EaC12b593Ef8B2eE1F6E6683"
+  },
+  "moonbasealpha": {
+    "TestQuerySender": "0x96D7D6Eba6C635e3EaC12b593Ef8B2eE1F6E6683"
+  },
+  "optimismgoerli": {
+    "TestQuerySender": "0x96D7D6Eba6C635e3EaC12b593Ef8B2eE1F6E6683"
+  },
+  "arbitrumgoerli": {
+    "TestQuerySender": "0x96D7D6Eba6C635e3EaC12b593Ef8B2eE1F6E6683"
+  }
+}
diff --git a/typescript/infra/config/environments/testnet3/testquerysender/verification.json b/typescript/infra/config/environments/testnet3/testquerysender/verification.json
new file mode 100644
index 000000000..440029f9f
--- /dev/null
+++ b/typescript/infra/config/environments/testnet3/testquerysender/verification.json
@@ -0,0 +1,66 @@
+{
+  "alfajores": [
+    {
+      "name": "TestQuerySender",
+      "address": "0x96D7D6Eba6C635e3EaC12b593Ef8B2eE1F6E6683",
+      "isProxy": false,
+      "constructorArguments": "0x"
+    }
+  ],
+  "fuji": [
+    {
+      "name": "TestQuerySender",
+      "address": "0x96D7D6Eba6C635e3EaC12b593Ef8B2eE1F6E6683",
+      "isProxy": false,
+      "constructorArguments": "0x"
+    }
+  ],
+  "mumbai": [
+    {
+      "name": "TestQuerySender",
+      "address": "0x96D7D6Eba6C635e3EaC12b593Ef8B2eE1F6E6683",
+      "isProxy": false,
+      "constructorArguments": "0x"
+    }
+  ],
+  "bsctestnet": [
+    {
+      "name": "TestQuerySender",
+      "address": "0x96D7D6Eba6C635e3EaC12b593Ef8B2eE1F6E6683",
+      "isProxy": false,
+      "constructorArguments": "0x"
+    }
+  ],
+  "goerli": [
+    {
+      "name": "TestQuerySender",
+      "address": "0x96D7D6Eba6C635e3EaC12b593Ef8B2eE1F6E6683",
+      "isProxy": false,
+      "constructorArguments": "0x"
+    }
+  ],
+  "moonbasealpha": [
+    {
+      "name": "TestQuerySender",
+      "address": "0x96D7D6Eba6C635e3EaC12b593Ef8B2eE1F6E6683",
+      "isProxy": false,
+      "constructorArguments": "0x"
+    }
+  ],
+  "optimismgoerli": [
+    {
+      "name": "TestQuerySender",
+      "address": "0x96D7D6Eba6C635e3EaC12b593Ef8B2eE1F6E6683",
+      "isProxy": false,
+      "constructorArguments": "0x"
+    }
+  ],
+  "arbitrumgoerli": [
+    {
+      "name": "TestQuerySender",
+      "address": "0x96D7D6Eba6C635e3EaC12b593Ef8B2eE1F6E6683",
+      "isProxy": false,
+      "constructorArguments": "0x"
+    }
+  ]
+}
diff --git a/typescript/infra/scripts/testcontracts/deploy-testquerysender.ts b/typescript/infra/scripts/testcontracts/deploy-testquerysender.ts
index 4f6c81986..45e0e0d9a 100644
--- a/typescript/infra/scripts/testcontracts/deploy-testquerysender.ts
+++ b/typescript/infra/scripts/testcontracts/deploy-testquerysender.ts
@@ -26,7 +26,7 @@ async function main() {
   // Get query router addresses
   const queryRouterDir = path.join(
     getEnvironmentDirectory(environment),
-    'interchain/queries',
+    'middleware/queries',
   );
   const queryRouterAddresses = objMap(
     readJSON(queryRouterDir, 'addresses.json'),
diff --git a/typescript/infra/scripts/verify.ts b/typescript/infra/scripts/verify.ts
index 9969be9a9..1397e3e0a 100644
--- a/typescript/infra/scripts/verify.ts
+++ b/typescript/infra/scripts/verify.ts
@@ -9,8 +9,13 @@ import { execCmd, readFileAtPath, readJSONAtPath } from '../src/utils/utils';
 
 import { assertEnvironment, getArgs, getCoreEnvironmentConfig } from './utils';
 
+// Requires https://github.com/crytic/solc-select to be installed and
+// present in your $PATH. The current solc compiler version should
+// already be installed via `solc-select install $VERSION`
 async function main() {
   const argv = await getArgs()
+    // This file can be generated by running `yarn hardhat flatten > flattened.sol`,
+    // and then removing any lines with SPDX identifiers (`solc` complains otherwise).
     .string('source')
     .describe('source', 'flattened solidity source file')
     .demandOption('source')