diff --git a/.circleci/config.yml b/.circleci/config.yml
index bccf2c4b3..c991d2dd6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -52,7 +52,7 @@ workflows:
 jobs:
   contract_cw1_subkeys:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     working_directory: ~/project/contracts/cw1-subkeys
     steps:
       - checkout:
@@ -62,7 +62,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-cw1-subkeys-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-cw1-subkeys-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -75,11 +75,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-cw1-subkeys-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-cw1-subkeys-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
 
   contract_cw1_whitelist:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     working_directory: ~/project/contracts/cw1-whitelist
     steps:
       - checkout:
@@ -89,7 +89,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-cw1-whitelist-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-cw1-whitelist-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -102,11 +102,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-cw1-whitelist-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-cw1-whitelist-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
 
   contract_cw1_whitelist_ng:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     working_directory: ~/project/contracts/cw1-whitelist-ng
     steps:
       - checkout:
@@ -116,7 +116,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-cw1-whitelist-ng-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-cw1-whitelist-ng-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -129,11 +129,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-cw1-whitelist-ng-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-cw1-whitelist-ng-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
 
   contract_cw3_fixed_multisig:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     working_directory: ~/project/contracts/cw3-fixed-multisig
     steps:
       - checkout:
@@ -143,7 +143,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-cw3-fixed-multisig-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-cw3-fixed-multisig-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -156,11 +156,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-cw3-fixed-multisig-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-cw3-fixed-multisig-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
 
   contract_cw3_flex_multisig:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     working_directory: ~/project/contracts/cw3-flex-multisig
     steps:
       - checkout:
@@ -170,7 +170,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-cw3-flex-multisig-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-cw3-flex-multisig-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -183,11 +183,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-cw3-flex-multisig-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-cw3-flex-multisig-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
 
   contract_cw4_group:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     working_directory: ~/project/contracts/cw4-group
     steps:
       - checkout:
@@ -197,7 +197,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-cw4-group-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-cw4-group-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -210,11 +210,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-cw4-group-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-cw4-group-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
 
   contract_cw4_stake:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     working_directory: ~/project/contracts/cw4-stake
     steps:
       - checkout:
@@ -224,7 +224,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-cw4-stake-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-cw4-stake-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -237,11 +237,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-cw4-stake-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-cw4-stake-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
 
   contract_cw20_base:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     working_directory: ~/project/contracts/cw20-base
     steps:
       - checkout:
@@ -251,7 +251,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-cw20-base-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-cw20-base-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -264,11 +264,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-cw20-base-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-cw20-base-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
 
   contract_cw20_ics20:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     working_directory: ~/project/contracts/cw20-ics20
     steps:
       - checkout:
@@ -278,7 +278,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-cw20-ics20-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-cw20-ics20-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -291,11 +291,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-cw20-ics20-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-cw20-ics20-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
 
   contract_cw1155_base:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     working_directory: ~/project/contracts/cw1155-base
     steps:
       - checkout:
@@ -305,7 +305,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-cw1155-base-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-cw1155-base-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Unit Tests
           environment:
@@ -318,11 +318,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-cw1155-base-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-cw1155-base-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
 
   package_controllers:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     working_directory: ~/project/packages/controllers
     steps:
       - checkout:
@@ -332,7 +332,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-controllers:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-v2-controllers:1.54.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Build library for native target
           command: cargo build --locked
@@ -343,11 +343,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-v2-controllers:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-v2-controllers:1.54.0-{{ checksum "~/project/Cargo.lock" }}
 
   package_utils:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     working_directory: ~/project/packages/utils
     steps:
       - checkout:
@@ -357,7 +357,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-utils:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-v2-utils:1.54.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Build library for native target
           command: cargo build --locked
@@ -368,11 +368,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-v2-utils:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-v2-utils:1.54.0-{{ checksum "~/project/Cargo.lock" }}
 
   package_cw1:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     working_directory: ~/project/packages/cw1
     steps:
       - checkout:
@@ -382,7 +382,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-cw1:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-v2-cw1:1.54.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Build library for native target
           command: cargo build --locked
@@ -396,11 +396,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-v2-cw1:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-v2-cw1:1.54.0-{{ checksum "~/project/Cargo.lock" }}
 
   package_cw2:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     working_directory: ~/project/packages/cw2
     steps:
       - checkout:
@@ -410,7 +410,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-cw2:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-v2-cw2:1.54.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Build library for native target
           command: cargo build --locked
@@ -422,11 +422,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-v2-cw2:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-v2-cw2:1.54.0-{{ checksum "~/project/Cargo.lock" }}
 
   package_cw3:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     working_directory: ~/project/packages/cw3
     steps:
       - checkout:
@@ -436,7 +436,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-cw3:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-v2-cw3:1.54.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Build library for native target
           command: cargo build --locked
@@ -450,11 +450,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-v2-cw3:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-v2-cw3:1.54.0-{{ checksum "~/project/Cargo.lock" }}
 
   package_cw4:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     working_directory: ~/project/packages/cw4
     steps:
       - checkout:
@@ -464,7 +464,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-cw4:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-v2-cw4:1.54.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Build library for native target
           command: cargo build --locked
@@ -478,11 +478,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-v2-cw4:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-v2-cw4:1.54.0-{{ checksum "~/project/Cargo.lock" }}
 
   package_cw20:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     working_directory: ~/project/packages/cw20
     steps:
       - checkout:
@@ -492,7 +492,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-cw20:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-v2-cw20:1.54.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Build library for native target
           command: cargo build --locked
@@ -506,11 +506,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-v2-cw20:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-v2-cw20:1.54.0-{{ checksum "~/project/Cargo.lock" }}
 
   package_cw1155:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     working_directory: ~/project/packages/cw1155
     steps:
       - checkout:
@@ -520,7 +520,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-cw1155:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-v2-cw1155:1.54.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Build library for native target
           command: cargo build --locked
@@ -534,11 +534,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-v2-cw1155:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-v2-cw1155:1.54.0-{{ checksum "~/project/Cargo.lock" }}
 
   lint:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     steps:
       - checkout
       - run:
@@ -546,7 +546,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-lint-rust:1.53.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-lint-rust:1.54.0-{{ checksum "Cargo.lock" }}
       - run:
           name: Add rustfmt component
           command: rustup component add rustfmt
@@ -565,7 +565,7 @@ jobs:
             - target/debug/.fingerprint
             - target/debug/build
             - target/debug/deps
-          key: cargocache-v2-lint-rust:1.53.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-lint-rust:1.54.0-{{ checksum "Cargo.lock" }}
 
   # This runs one time on the top level to ensure all contracts compile properly into wasm.
   # We don't run the wasm build per contract build, and then reuse a lot of the same dependencies, so this speeds up CI time
@@ -573,7 +573,7 @@ jobs:
   # We also sanity-check the resultant wasm files.
   wasm-build:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     steps:
       - checkout:
           path: ~/project
@@ -582,7 +582,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-wasm-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-wasm-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Add wasm32 target
           command: rustup target add wasm32-unknown-unknown
@@ -597,12 +597,12 @@ jobs:
       - run:
           name: Install check_contract
           # Uses --debug for compilation speed
-          command: cargo install --debug --version 1.0.0-beta --features iterator --example check_contract -- cosmwasm-vm
+          command: cargo install --debug --version 1.0.0-beta4 --features iterator --example check_contract -- cosmwasm-vm
       - save_cache:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-wasm-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-wasm-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Check wasm contracts
           command: |
@@ -614,7 +614,7 @@ jobs:
 
   package_multi_test:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     working_directory: ~/project/packages/multi-test
     steps:
       - checkout:
@@ -624,7 +624,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-multi-test:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-v2-multi-test:1.54.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Build library for native target
           command: cargo build --locked
@@ -638,11 +638,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-v2-multi-test:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-v2-multi-test:1.54.0-{{ checksum "~/project/Cargo.lock" }}
 
   package_storage_plus:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     working_directory: ~/project/packages/storage-plus
     steps:
       - checkout:
@@ -652,7 +652,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-storage-plus:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-v2-storage-plus:1.54.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Build library for native target (no iterator)
           command: cargo build --locked --no-default-features
@@ -669,11 +669,11 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-v2-storage-plus:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-v2-storage-plus:1.54.0-{{ checksum "~/project/Cargo.lock" }}
 
   benchmarking:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     environment:
       RUST_BACKTRACE: 1
     steps:
@@ -684,7 +684,7 @@ jobs:
           command: rustc --version && cargo --version
       - restore_cache:
           keys:
-            - cargocache-v2-benchmarking-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+            - cargocache-v2-benchmarking-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
       - run:
           name: Run storage-plus benchmarks
           working_directory: ~/project/packages/storage-plus
@@ -693,7 +693,7 @@ jobs:
           paths:
             - /usr/local/cargo/registry
             - target
-          key: cargocache-v2-benchmarking-rust:1.53.0-{{ checksum "~/project/Cargo.lock" }}
+          key: cargocache-v2-benchmarking-rust:1.54.0-{{ checksum "~/project/Cargo.lock" }}
 
   # This job roughly follows the instructions from https://circleci.com/blog/publishing-to-github-releases-via-circleci/
   build_and_upload_contracts:
@@ -743,7 +743,7 @@ jobs:
 
   build_and_upload_schemas:
     docker:
-      - image: rust:1.53.0
+      - image: rust:1.54.0
     working_directory: ~/project
     steps:
       - checkout:
diff --git a/contracts/cw1-whitelist-ng/src/contract.rs b/contracts/cw1-whitelist-ng/src/contract.rs
index 301b20c96..177b30034 100644
--- a/contracts/cw1-whitelist-ng/src/contract.rs
+++ b/contracts/cw1-whitelist-ng/src/contract.rs
@@ -223,7 +223,7 @@ mod tests {
 
         // instantiate the contract
         let admins = vec![alice.to_owned(), bob.to_owned(), carl.to_owned()];
-        let info = mock_info(&anyone, &[]);
+        let info = mock_info(anyone, &[]);
         contract
             .instantiate(deps.as_mut(), mock_env(), info, admins, true)
             .unwrap();
@@ -239,7 +239,7 @@ mod tests {
         );
 
         // anyone cannot modify the contract
-        let info = mock_info(&anyone, &[]);
+        let info = mock_info(anyone, &[]);
         let err = contract
             .update_admins(deps.as_mut(), mock_env(), info, vec![anyone.to_owned()])
             .unwrap_err();
@@ -247,7 +247,7 @@ mod tests {
 
         // but alice can kick out carl
         let admins = vec![alice.to_owned(), bob.to_owned()];
-        let info = mock_info(&alice, &[]);
+        let info = mock_info(alice, &[]);
         contract
             .update_admins(deps.as_mut(), mock_env(), info, admins)
             .unwrap();
@@ -263,14 +263,14 @@ mod tests {
         );
 
         // carl cannot freeze it
-        let info = mock_info(&carl, &[]);
+        let info = mock_info(carl, &[]);
         let err = contract
             .freeze(deps.as_mut(), mock_env(), info)
             .unwrap_err();
         assert_eq!(err, ContractError::Unauthorized {});
 
         // but bob can
-        let info = mock_info(&bob, &[]);
+        let info = mock_info(bob, &[]);
         contract.freeze(deps.as_mut(), mock_env(), info).unwrap();
         let expected = AdminListResponse {
             admins: vec![alice.to_owned(), bob.to_owned()],
@@ -282,7 +282,7 @@ mod tests {
         );
 
         // and now alice cannot change it again
-        let info = mock_info(&alice, &[]);
+        let info = mock_info(alice, &[]);
         let err = contract
             .update_admins(deps.as_mut(), mock_env(), info, vec![alice.to_owned()])
             .unwrap_err();
@@ -300,7 +300,7 @@ mod tests {
 
         // instantiate the contract
         let admins = vec![alice.to_owned(), carl.to_owned()];
-        let info = mock_info(&bob, &[]);
+        let info = mock_info(bob, &[]);
         contract
             .instantiate(deps.as_mut(), mock_env(), info, admins, false)
             .unwrap();
@@ -321,14 +321,14 @@ mod tests {
         ];
 
         // bob cannot execute them
-        let info = mock_info(&bob, &[]);
+        let info = mock_info(bob, &[]);
         let err = contract
             .execute(deps.as_mut(), mock_env(), info, msgs.clone())
             .unwrap_err();
         assert_eq!(err, ContractError::Unauthorized {});
 
         // but carl can
-        let info = mock_info(&carl, &[]);
+        let info = mock_info(carl, &[]);
         let res = contract
             .execute(deps.as_mut(), mock_env(), info, msgs.clone())
             .unwrap();
@@ -346,7 +346,7 @@ mod tests {
         let alice = "alice";
 
         let admins = vec![alice.to_owned()];
-        let info = mock_info(&alice, &[]);
+        let info = mock_info(alice, &[]);
         contract
             .instantiate(deps.as_mut(), mock_env(), info, admins, false)
             .unwrap();
@@ -357,7 +357,7 @@ mod tests {
             .execute(
                 deps.as_mut(),
                 mock_env(),
-                mock_info(&alice, &[]),
+                mock_info(alice, &[]),
                 msgs.clone(),
             )
             .unwrap();
@@ -380,7 +380,7 @@ mod tests {
 
         // instantiate the contract
         let admins = vec![alice.to_owned(), bob.to_owned()];
-        let info = mock_info(&anyone, &[]);
+        let info = mock_info(anyone, &[]);
         contract
             .instantiate(deps.as_mut(), mock_env(), info, admins, false)
             .unwrap();
diff --git a/contracts/cw1-whitelist/src/contract.rs b/contracts/cw1-whitelist/src/contract.rs
index c7c8784fb..77f2b7ef7 100644
--- a/contracts/cw1-whitelist/src/contract.rs
+++ b/contracts/cw1-whitelist/src/contract.rs
@@ -162,7 +162,7 @@ mod tests {
             admins: vec![alice.to_string(), bob.to_string(), carl.to_string()],
             mutable: true,
         };
-        let info = mock_info(&anyone, &[]);
+        let info = mock_info(anyone, &[]);
         instantiate(deps.as_mut(), mock_env(), info, instantiate_msg).unwrap();
 
         // ensure expected config
@@ -176,7 +176,7 @@ mod tests {
         let msg = ExecuteMsg::UpdateAdmins {
             admins: vec![anyone.to_string()],
         };
-        let info = mock_info(&anyone, &[]);
+        let info = mock_info(anyone, &[]);
         let err = execute(deps.as_mut(), mock_env(), info, msg).unwrap_err();
         assert_eq!(err, ContractError::Unauthorized {});
 
@@ -184,7 +184,7 @@ mod tests {
         let msg = ExecuteMsg::UpdateAdmins {
             admins: vec![alice.to_string(), bob.to_string()],
         };
-        let info = mock_info(&alice, &[]);
+        let info = mock_info(alice, &[]);
         execute(deps.as_mut(), mock_env(), info, msg).unwrap();
 
         // ensure expected config
@@ -195,12 +195,12 @@ mod tests {
         assert_eq!(query_admin_list(deps.as_ref()).unwrap(), expected);
 
         // carl cannot freeze it
-        let info = mock_info(&carl, &[]);
+        let info = mock_info(carl, &[]);
         let err = execute(deps.as_mut(), mock_env(), info, ExecuteMsg::Freeze {}).unwrap_err();
         assert_eq!(err, ContractError::Unauthorized {});
 
         // but bob can
-        let info = mock_info(&bob, &[]);
+        let info = mock_info(bob, &[]);
         execute(deps.as_mut(), mock_env(), info, ExecuteMsg::Freeze {}).unwrap();
         let expected = AdminListResponse {
             admins: vec![alice.to_string(), bob.to_string()],
@@ -212,7 +212,7 @@ mod tests {
         let msg = ExecuteMsg::UpdateAdmins {
             admins: vec![alice.to_string()],
         };
-        let info = mock_info(&alice, &[]);
+        let info = mock_info(alice, &[]);
         let err = execute(deps.as_mut(), mock_env(), info, msg).unwrap_err();
         assert_eq!(err, ContractError::Unauthorized {});
     }
@@ -230,7 +230,7 @@ mod tests {
             admins: vec![alice.to_string(), carl.to_string()],
             mutable: false,
         };
-        let info = mock_info(&bob, &[]);
+        let info = mock_info(bob, &[]);
         instantiate(deps.as_mut(), mock_env(), info, instantiate_msg).unwrap();
 
         let freeze: ExecuteMsg<Empty> = ExecuteMsg::Freeze {};
@@ -252,12 +252,12 @@ mod tests {
         let execute_msg = ExecuteMsg::Execute { msgs: msgs.clone() };
 
         // bob cannot execute them
-        let info = mock_info(&bob, &[]);
+        let info = mock_info(bob, &[]);
         let err = execute(deps.as_mut(), mock_env(), info, execute_msg.clone()).unwrap_err();
         assert_eq!(err, ContractError::Unauthorized {});
 
         // but carl can
-        let info = mock_info(&carl, &[]);
+        let info = mock_info(carl, &[]);
         let res = execute(deps.as_mut(), mock_env(), info, execute_msg).unwrap();
         assert_eq!(
             res.messages,
@@ -280,7 +280,7 @@ mod tests {
             admins: vec![alice.to_string(), bob.to_string()],
             mutable: false,
         };
-        let info = mock_info(&anyone, &[]);
+        let info = mock_info(anyone, &[]);
         instantiate(deps.as_mut(), mock_env(), info, instantiate_msg).unwrap();
 
         // let us make some queries... different msg types by owner and by other
diff --git a/contracts/cw4-stake/src/contract.rs b/contracts/cw4-stake/src/contract.rs
index e1d372083..f57be9b9b 100644
--- a/contracts/cw4-stake/src/contract.rs
+++ b/contracts/cw4-stake/src/contract.rs
@@ -669,7 +669,7 @@ mod tests {
             }) => {
                 assert_eq!(contract_addr.as_str(), CW20_ADDRESS);
                 assert_eq!(funds.len(), 0);
-                let parsed: Cw20ExecuteMsg = from_slice(&msg).unwrap();
+                let parsed: Cw20ExecuteMsg = from_slice(msg).unwrap();
                 assert_eq!(
                     parsed,
                     Cw20ExecuteMsg::Transfer {
diff --git a/packages/multi-test/src/app.rs b/packages/multi-test/src/app.rs
index 326d54587..c23e6873a 100644
--- a/packages/multi-test/src/app.rs
+++ b/packages/multi-test/src/app.rs
@@ -924,7 +924,7 @@ where
             Ok(v) => v,
             Err(e) => {
                 return SystemResult::Err(SystemError::InvalidRequest {
-                    error: format!("Parsing query request: {}", e.to_string()),
+                    error: format!("Parsing query request: {}", e),
                     request: bin_request.into(),
                 })
             }
diff --git a/packages/multi-test/src/wasm.rs b/packages/multi-test/src/wasm.rs
index 56279925b..49646d876 100644
--- a/packages/multi-test/src/wasm.rs
+++ b/packages/multi-test/src/wasm.rs
@@ -798,7 +798,7 @@ where
             .range_raw(storage, None, None, Order::Ascending)
             .count();
         // we make this longer so it is not rejected by tests
-        Addr::unchecked(format!("Contract #{}", count.to_string()))
+        Addr::unchecked(format!("Contract #{}", count))
     }
 
     fn contract_namespace(&self, contract: &Addr) -> Vec<u8> {
diff --git a/packages/storage-plus/src/indexed_snapshot.rs b/packages/storage-plus/src/indexed_snapshot.rs
index 8476572bd..e5f45bfa2 100644
--- a/packages/storage-plus/src/indexed_snapshot.rs
+++ b/packages/storage-plus/src/indexed_snapshot.rs
@@ -58,7 +58,7 @@ impl<'a, K, T, I> IndexedSnapshotMap<'a, K, T, I> {
     }
 
     pub fn changelog(&self) -> &Map<'a, (K, u64), ChangeSet<T>> {
-        &self.primary.changelog()
+        self.primary.changelog()
     }
 }