diff --git a/ferveo/src/dkg.rs b/ferveo/src/dkg.rs
index dc22df78..9c95d96a 100644
--- a/ferveo/src/dkg.rs
+++ b/ferveo/src/dkg.rs
@@ -355,7 +355,7 @@ pub(crate) mod test_common {
         my_index: usize,
     ) -> TestSetup {
         let keypairs = gen_keypairs(shares_num);
-        let mut validators = gen_validators(&keypairs.as_slice());
+        let mut validators = gen_validators(keypairs.as_slice());
         validators.sort();
         let me = validators[my_index].clone();
         let dkg = PubliclyVerifiableDkg::new(
diff --git a/ferveo/src/lib.rs b/ferveo/src/lib.rs
index fa5340f1..41da3ba7 100644
--- a/ferveo/src/lib.rs
+++ b/ferveo/src/lib.rs
@@ -415,8 +415,8 @@ mod test_dkg_full {
         // Now, every participant separately:
         // TODO: Move this logic outside tests (see #162, #163)
         let updated_shares: Vec<_> = remaining_validators
-            .iter()
-            .map(|(_validator_address, validator)| {
+            .values()
+            .map(|validator| {
                 // Current participant receives updates from other participants
                 let updates_for_participant: Vec<_> = share_updates
                     .values()
@@ -496,9 +496,9 @@ mod test_dkg_full {
         assert_eq!(domain_points.len(), security_threshold as usize);
         assert_eq!(decryption_shares.len(), security_threshold as usize);
 
-        let lagrange = tpke::prepare_combine_simple::<E>(&domain_points);
+        let lagrange = tpke::prepare_combine_simple::<E>(domain_points);
         let new_shared_secret =
-            tpke::share_combine_simple::<E>(&decryption_shares, &lagrange);
+            tpke::share_combine_simple::<E>(decryption_shares, &lagrange);
 
         assert_eq!(
             old_shared_secret, new_shared_secret,
@@ -552,8 +552,8 @@ mod test_dkg_full {
         // TODO: Move this logic outside tests (see #162, #163)
         let updated_shares: Vec<_> = dkg
             .validators
-            .iter()
-            .map(|(_validator_address, validator)| {
+            .values()
+            .map(|validator| {
                 // Current participant receives updates from other participants
                 let updates_for_participant: Vec<_> = share_updates
                     .values()
@@ -585,7 +585,7 @@ mod test_dkg_full {
                 .map(|(share_index, validator_keypair)| {
                     DecryptionShareSimple::create(
                         &validator_keypair.decryption_key,
-                        &updated_shares.get(share_index).unwrap(),
+                        updated_shares.get(share_index).unwrap(),
                         &ciphertext.header().unwrap(),
                         aad,
                         &dkg.pvss_params.g_inv(),
diff --git a/ferveo/src/refresh.rs b/ferveo/src/refresh.rs
index bb11bb48..ce87c81c 100644
--- a/ferveo/src/refresh.rs
+++ b/ferveo/src/refresh.rs
@@ -130,17 +130,17 @@ mod tests_refresh {
     type E = ark_bls12_381::Bls12_381;
     type ScalarField = <E as Pairing>::ScalarField;
 
+    use group_threshold_cryptography::{
+        test_common::setup_simple, PrivateDecryptionContextSimple,
+        PrivateKeyShare,
+    };
+
     use crate::{
         apply_updates_to_private_share, prepare_share_updates_for_recovery,
         prepare_share_updates_for_refresh,
         recover_share_from_updated_private_shares,
     };
 
-    use group_threshold_cryptography::{
-        test_common::setup_simple, PrivateDecryptionContextSimple,
-        PrivateKeyShare,
-    };
-
     fn make_new_share_fragments_for_recovery<R: RngCore>(
         rng: &mut R,
         threshold: usize,
@@ -241,6 +241,7 @@ mod tests_refresh {
         assert_eq!(new_private_key_share, original_private_key_share);
 
         // If we don't have enough private share updates, the resulting private share will be incorrect
+        assert_eq!(domain_points.len(), new_share_fragments.len());
         let incorrect_private_key_share =
             recover_share_from_updated_private_shares(
                 &x_r,
@@ -342,7 +343,7 @@ mod tests_refresh {
             .iter()
             .map(|p| {
                 let deltas_i = prepare_share_updates_for_refresh::<E>(
-                    &domain_points,
+                    domain_points,
                     &h,
                     threshold,
                     rng,
diff --git a/tpke/benches/arkworks.rs b/tpke/benches/arkworks.rs
index 60459db0..953f067c 100644
--- a/tpke/benches/arkworks.rs
+++ b/tpke/benches/arkworks.rs
@@ -10,13 +10,13 @@ use ark_ec::{
     pairing::{prepare_g1, prepare_g2, Pairing},
     AffineRepr, CurveGroup,
 };
-use ark_ff::{BigInteger256, Field, One, UniformRand, Zero};
+use ark_ff::{BigInteger256, Field, UniformRand};
 use criterion::{
     black_box, criterion_group, criterion_main, BenchmarkId, Criterion,
 };
 use itertools::izip;
 use rand::prelude::StdRng;
-use rand_core::{RngCore, SeedableRng};
+use rand_core::SeedableRng;
 
 type E = Bls12_381;
 type G1Prepared = <E as Pairing>::G1Prepared;
diff --git a/tpke/benches/tpke.rs b/tpke/benches/tpke.rs
index c122f7c9..cb553c27 100644
--- a/tpke/benches/tpke.rs
+++ b/tpke/benches/tpke.rs
@@ -1,10 +1,7 @@
 #![allow(clippy::redundant_closure)]
 
-use std::collections::HashMap;
-
 use ark_bls12_381::{Bls12_381, Fr, G1Affine as G1, G2Affine as G2};
-use ark_ec::{pairing::Pairing, AffineRepr};
-use ark_ff::Zero;
+use ark_ec::pairing::Pairing;
 use criterion::{
     black_box, criterion_group, criterion_main, BenchmarkId, Criterion,
 };