diff --git a/tests/endpoints/admin.rs b/tests/endpoints/admin.rs
index 171081b..c688ed3 100644
--- a/tests/endpoints/admin.rs
+++ b/tests/endpoints/admin.rs
@@ -111,12 +111,24 @@ fn add_remove_token_from_whitelist() {
         Some(TxExpect::user_error("str:Not privileged")),
     );
 
+    state.add_token_to_whitelist(
+        ADMIN_BRIDGE_CONTRACT_ADDRESS_EXPR,
+        ANOTHER_TOKEN_IDENTIFIER,
+        None,
+    );
+
     state.add_token_to_whitelist(
         ADMIN_BRIDGE_CONTRACT_ADDRESS_EXPR,
         ITHEUM_TOKEN_IDENTIFIER,
         None,
     );
 
+    state.add_token_to_whitelist(
+        ADMIN_BRIDGE_CONTRACT_ADDRESS_EXPR,
+        ITHEUM_TOKEN_IDENTIFIER,
+        Some(TxExpect::user_error("str:Token already in whitelist")),
+    );
+
     state.world.sc_query(
         ScQueryStep::new()
             .call(state.contract.token_whitelist())
diff --git a/tests/endpoints/public.rs b/tests/endpoints/public.rs
index 13db45c..415f96b 100644
--- a/tests/endpoints/public.rs
+++ b/tests/endpoints/public.rs
@@ -38,6 +38,10 @@ fn send_to_bridge_test() {
 
     state.add_to_whitelist(ADMIN_BRIDGE_CONTRACT_ADDRESS_EXPR, first_user.clone(), None);
 
+    state.remove_from_whitelist(ADMIN_BRIDGE_CONTRACT_ADDRESS_EXPR, first_user.clone(), None);
+
+    state.add_to_whitelist(ADMIN_BRIDGE_CONTRACT_ADDRESS_EXPR, first_user.clone(), None);
+
     state.send_to_liquidity(
         FIRST_USER_ADDRESS_EXPR,
         (ITHEUM_TOKEN_IDENTIFIER_EXPR, 0u64, "1_000"),
diff --git a/tests/endpoints/relayer.rs b/tests/endpoints/relayer.rs
index 668f884..024b791 100644
--- a/tests/endpoints/relayer.rs
+++ b/tests/endpoints/relayer.rs
@@ -22,6 +22,8 @@ fn relayer_test() {
 
     state
         .default_deploy_and_set()
+        .set_relayer_state_active(OWNER_BRIDGE_CONTRACT_ADDRESS_EXPR, None)
+        .set_relayer_state_inactive(OWNER_BRIDGE_CONTRACT_ADDRESS_EXPR, None)
         .set_relayer_state_active(OWNER_BRIDGE_CONTRACT_ADDRESS_EXPR, None);
 
     state.send_from_liquidity(