diff --git a/kit/tests/common.rs b/kit/tests/common.rs
index 223405ab..e4091f26 100644
--- a/kit/tests/common.rs
+++ b/kit/tests/common.rs
@@ -3,14 +3,14 @@ use dfmm_kit::{
     behaviors::{
         creator::{self, Create},
         deploy::Deploy,
-        token_admin::{self, TokenAdmin},
+        token::{self, TokenAdmin},
     },
     bindings::{
         constant_sum_solver::ConstantSumParams, geometric_mean_solver::GeometricMeanParams,
     },
     pool::{
         constant_sum::{ConstantSumAllocationData, ConstantSumPool},
-        geometric_mean::{GeometricMeanAllocationData, GeometricMeanPool},
+        // geometric_mean::{GeometricMeanAllocationData, GeometricMeanPool},
         BaseConfig,
     },
     TokenData,
@@ -65,12 +65,11 @@ pub fn spawn_token_admin(world: &mut World) {
         decimals: TOKEN_Y_DECIMALS,
         address: None,
     };
-    let data = token_admin::Config {
+    let data = token::Config {
         token_data: vec![token_x, token_y],
     };
-    world.add_agent(
-        Agent::builder(TOKEN_ADMIN).with_behavior(TokenAdmin::<token_admin::Config> { data }),
-    );
+    world
+        .add_agent(Agent::builder(TOKEN_ADMIN).with_behavior(TokenAdmin::<token::Config> { data }));
 }
 
 pub fn spawn_constant_sum_creator(world: &mut World) {
diff --git a/kit/tests/deployer.rs b/kit/tests/deployer.rs
index 81149415..0442a826 100644
--- a/kit/tests/deployer.rs
+++ b/kit/tests/deployer.rs
@@ -2,7 +2,7 @@ include!("common.rs");
 
 use std::str::FromStr;
 
-use dfmm_kit::behaviors::deployer::DeploymentData;
+use dfmm_kit::behaviors::deploy::DeploymentData;
 use ethers::types::Address as eAddress;
 use tracing::info;
 
diff --git a/kit/tests/token_admin_integration.rs b/kit/tests/token_admin_integration.rs
index 2371caa4..ac91b655 100644
--- a/kit/tests/token_admin_integration.rs
+++ b/kit/tests/token_admin_integration.rs
@@ -16,10 +16,7 @@ async fn run_token_admin() {
 
     let task = tokio::spawn(async move {
         loop {
-            if let Ok(message) = messager
-                .get_next::<Vec<TokenData>>()
-                .await
-            {
+            if let Ok(message) = messager.get_next::<Vec<TokenData>>().await {
                 let data = message.data;
                 info!("Saw message data: {:#?}", data);
 
@@ -35,7 +32,7 @@ async fn run_token_admin() {
                     decimals: TOKEN_Y_DECIMALS,
                     address: None,
                 };
-                let mock_data = token_admin::Config {
+                let mock_data = token::Config {
                     token_data: vec![token_x, token_y],
                 };
                 assert_eq!(data[0].name, mock_data.token_data[0].name);