diff --git a/src/streamer.rs b/src/streamer.rs
index 9af0552ce1..719aa46aa4 100644
--- a/src/streamer.rs
+++ b/src/streamer.rs
@@ -723,8 +723,8 @@ mod test {
             serve.local_addr().unwrap(),
             event.local_addr().unwrap(),
         );
-        let crdt = Crdt::new(d);
         trace!("data: {:?}", d);
+        let crdt = Crdt::new(d);
         (Arc::new(RwLock::new(crdt)), gossip, replicate, serve)
     }
 
diff --git a/src/thin_client.rs b/src/thin_client.rs
index 8959e0a944..6e5e2e3b55 100644
--- a/src/thin_client.rs
+++ b/src/thin_client.rs
@@ -208,7 +208,7 @@ mod tests {
             bank,
             alice.last_id(),
             Some(Duration::from_millis(30)),
-            leader.data,
+            leader.data.clone(),
             leader.requests,
             leader.event,
             leader.broadcast,
@@ -243,13 +243,12 @@ mod tests {
         let bank = Bank::new(&alice);
         let bob_pubkey = KeyPair::new().pubkey();
         let exit = Arc::new(AtomicBool::new(false));
-        let events_addr = leader.data.events_addr;
 
         let server = Server::leader(
             bank,
             alice.last_id(),
             Some(Duration::from_millis(30)),
-            leader.data,
+            leader.data.clone(),
             leader.requests,
             leader.event,
             leader.broadcast,
@@ -265,7 +264,7 @@ mod tests {
             .set_read_timeout(Some(Duration::new(5, 0)))
             .unwrap();
         let events_socket = UdpSocket::bind("0.0.0.0:0").unwrap();
-        let mut client = ThinClient::new(leader.data.requests_addr, requests_socket, events_addr, events_socket);
+        let mut client = ThinClient::new(leader.data.requests_addr, requests_socket, leader.data.events_addr, events_socket);
         let last_id = client.get_last_id().wait().unwrap();
 
         let tr = Transaction::new(&alice.keypair(), bob_pubkey, 500, last_id);
@@ -368,7 +367,7 @@ mod tests {
             leader_bank,
             alice.last_id(),
             None,
-            leader.data,
+            leader.data.clone(),
             leader.requests,
             leader.event,
             leader.broadcast,
diff --git a/src/tvu.rs b/src/tvu.rs
index f8b6d4d89b..157f09e0c6 100644
--- a/src/tvu.rs
+++ b/src/tvu.rs
@@ -226,7 +226,7 @@ pub mod tests {
         let replicate_addr = target1.data.replicate_addr;
         let bank = Arc::new(Bank::new(&mint));
         let tvu = Tvu::new(
-            bank,
+            bank.clone(),
             target1.data,
             target1.gossip,
             target1.replicate,