diff --git a/packages/access/src/tests/test_accesscontrol.cairo b/packages/access/src/tests/test_accesscontrol.cairo
index 81adcddfb..3b09a01f7 100644
--- a/packages/access/src/tests/test_accesscontrol.cairo
+++ b/packages/access/src/tests/test_accesscontrol.cairo
@@ -81,7 +81,7 @@ fn test_assert_only_role() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller is missing role',))]
+#[should_panic(expected: 'Caller is missing role')]
 fn test_assert_only_role_unauthorized() {
     let state = setup();
     start_cheat_caller_address(test_address(), OTHER());
@@ -89,7 +89,7 @@ fn test_assert_only_role_unauthorized() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller is missing role',))]
+#[should_panic(expected: 'Caller is missing role')]
 fn test_assert_only_role_unauthorized_when_authorized_for_another_role() {
     let mut state = setup();
     state.grant_role(ROLE, AUTHORIZED());
@@ -151,7 +151,7 @@ fn test_grantRole_multiple_times_for_granted_role() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller is missing role',))]
+#[should_panic(expected: 'Caller is missing role')]
 fn test_grant_role_unauthorized() {
     let mut state = setup();
     start_cheat_caller_address(test_address(), AUTHORIZED());
@@ -159,7 +159,7 @@ fn test_grant_role_unauthorized() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller is missing role',))]
+#[should_panic(expected: 'Caller is missing role')]
 fn test_grantRole_unauthorized() {
     let mut state = setup();
     start_cheat_caller_address(test_address(), AUTHORIZED());
@@ -245,7 +245,7 @@ fn test_revokeRole_multiple_times_for_granted_role() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller is missing role',))]
+#[should_panic(expected: 'Caller is missing role')]
 fn test_revoke_role_unauthorized() {
     let mut state = setup();
     start_cheat_caller_address(test_address(), OTHER());
@@ -253,7 +253,7 @@ fn test_revoke_role_unauthorized() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller is missing role',))]
+#[should_panic(expected: 'Caller is missing role')]
 fn test_revokeRole_unauthorized() {
     let mut state = setup();
     start_cheat_caller_address(test_address(), OTHER());
@@ -345,7 +345,7 @@ fn test_renounceRole_multiple_times_for_granted_role() {
 }
 
 #[test]
-#[should_panic(expected: ('Can only renounce role for self',))]
+#[should_panic(expected: 'Can only renounce role for self')]
 fn test_renounce_role_unauthorized() {
     let mut state = setup();
     let contract_address = test_address();
@@ -357,7 +357,7 @@ fn test_renounce_role_unauthorized() {
 }
 
 #[test]
-#[should_panic(expected: ('Can only renounce role for self',))]
+#[should_panic(expected: 'Can only renounce role for self')]
 fn test_renounceRole_unauthorized() {
     let mut state = setup();
     start_cheat_caller_address(test_address(), ADMIN());
@@ -423,7 +423,7 @@ fn test_new_admin_can_revoke_roles() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller is missing role',))]
+#[should_panic(expected: 'Caller is missing role')]
 fn test_previous_admin_cannot_grant_roles() {
     let mut state = setup();
     state.set_role_admin(ROLE, OTHER_ROLE);
@@ -432,7 +432,7 @@ fn test_previous_admin_cannot_grant_roles() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller is missing role',))]
+#[should_panic(expected: 'Caller is missing role')]
 fn test_previous_admin_cannot_revoke_roles() {
     let mut state = setup();
     state.set_role_admin(ROLE, OTHER_ROLE);
diff --git a/packages/access/src/tests/test_ownable.cairo b/packages/access/src/tests/test_ownable.cairo
index 4bf7ec694..329823c81 100644
--- a/packages/access/src/tests/test_ownable.cairo
+++ b/packages/access/src/tests/test_ownable.cairo
@@ -45,7 +45,7 @@ fn test_initializer_owner() {
 }
 
 #[test]
-#[should_panic(expected: ('New owner is the zero address',))]
+#[should_panic(expected: 'New owner is the zero address')]
 fn test_initializer_zero_owner() {
     let mut state = COMPONENT_STATE();
     state.initializer(ZERO());
@@ -63,7 +63,7 @@ fn test_assert_only_owner() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller is not the owner',))]
+#[should_panic(expected: 'Caller is not the owner')]
 fn test_assert_only_owner_when_not_owner() {
     let state = setup();
     start_cheat_caller_address(test_address(), OTHER());
@@ -117,7 +117,7 @@ fn test_transfer_ownership() {
 }
 
 #[test]
-#[should_panic(expected: ('New owner is the zero address',))]
+#[should_panic(expected: 'New owner is the zero address')]
 fn test_transfer_ownership_to_zero() {
     let mut state = setup();
     start_cheat_caller_address(test_address(), OWNER());
@@ -125,7 +125,7 @@ fn test_transfer_ownership_to_zero() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller is not the owner',))]
+#[should_panic(expected: 'Caller is not the owner')]
 fn test_transfer_ownership_from_nonowner() {
     let mut state = setup();
     start_cheat_caller_address(test_address(), OTHER());
@@ -145,7 +145,7 @@ fn test_transferOwnership() {
 }
 
 #[test]
-#[should_panic(expected: ('New owner is the zero address',))]
+#[should_panic(expected: 'New owner is the zero address')]
 fn test_transferOwnership_to_zero() {
     let mut state = setup();
     start_cheat_caller_address(test_address(), OWNER());
@@ -153,7 +153,7 @@ fn test_transferOwnership_to_zero() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller is not the owner',))]
+#[should_panic(expected: 'Caller is not the owner')]
 fn test_transferOwnership_from_nonowner() {
     let mut state = setup();
     start_cheat_caller_address(test_address(), OTHER());
@@ -177,7 +177,7 @@ fn test_renounce_ownership() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller is not the owner',))]
+#[should_panic(expected: 'Caller is not the owner')]
 fn test_renounce_ownership_from_nonowner() {
     let mut state = setup();
     start_cheat_caller_address(test_address(), OTHER());
@@ -197,7 +197,7 @@ fn test_renounceOwnership() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller is not the owner',))]
+#[should_panic(expected: 'Caller is not the owner')]
 fn test_renounceOwnership_from_nonowner() {
     let mut state = setup();
     start_cheat_caller_address(test_address(), OTHER());
diff --git a/packages/access/src/tests/test_ownable_twostep.cairo b/packages/access/src/tests/test_ownable_twostep.cairo
index ab0e67be9..b8ef090cd 100644
--- a/packages/access/src/tests/test_ownable_twostep.cairo
+++ b/packages/access/src/tests/test_ownable_twostep.cairo
@@ -97,7 +97,7 @@ fn test_transfer_ownership_to_zero() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller is not the owner',))]
+#[should_panic(expected: 'Caller is not the owner')]
 fn test_transfer_ownership_from_nonowner() {
     let mut state = setup();
     start_cheat_caller_address(test_address(), OTHER());
@@ -138,7 +138,7 @@ fn test_transferOwnership_to_zero() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller is not the owner',))]
+#[should_panic(expected: 'Caller is not the owner')]
 fn test_transferOwnership_from_nonowner() {
     let mut state = setup();
     start_cheat_caller_address(test_address(), OTHER());
@@ -165,7 +165,7 @@ fn test_accept_ownership() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller is not the pending owner',))]
+#[should_panic(expected: 'Caller is not the pending owner')]
 fn test_accept_ownership_from_nonpending() {
     let mut state = setup();
     state.Ownable_pending_owner.write(NEW_OWNER());
@@ -189,7 +189,7 @@ fn test_acceptOwnership() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller is not the pending owner',))]
+#[should_panic(expected: 'Caller is not the pending owner')]
 fn test_acceptOwnership_from_nonpending() {
     let mut state = setup();
     state.Ownable_pending_owner.write(NEW_OWNER());
@@ -231,7 +231,7 @@ fn test_renounce_ownership_resets_pending_owner() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller is not the owner',))]
+#[should_panic(expected: 'Caller is not the owner')]
 fn test_renounce_ownership_from_nonowner() {
     let mut state = setup();
     start_cheat_caller_address(test_address(), OTHER());
@@ -252,7 +252,7 @@ fn test_renounceOwnership() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller is not the owner',))]
+#[should_panic(expected: 'Caller is not the owner')]
 fn test_renounceOwnership_from_nonowner() {
     let mut state = setup();
     start_cheat_caller_address(test_address(), OTHER());
diff --git a/packages/security/src/tests/test_initializable.cairo b/packages/security/src/tests/test_initializable.cairo
index 0b7ac8fc7..6fbfada0a 100644
--- a/packages/security/src/tests/test_initializable.cairo
+++ b/packages/security/src/tests/test_initializable.cairo
@@ -17,7 +17,7 @@ fn test_initialize() {
 }
 
 #[test]
-#[should_panic(expected: ('Initializable: is initialized',))]
+#[should_panic(expected: 'Initializable: is initialized')]
 fn test_initialize_when_initialized() {
     let mut state = COMPONENT_STATE();
     state.initialize();
diff --git a/packages/security/src/tests/test_pausable.cairo b/packages/security/src/tests/test_pausable.cairo
index 486819c0e..6ccbc921a 100644
--- a/packages/security/src/tests/test_pausable.cairo
+++ b/packages/security/src/tests/test_pausable.cairo
@@ -42,7 +42,7 @@ fn test_assert_paused_when_paused() {
 }
 
 #[test]
-#[should_panic(expected: ('Pausable: not paused',))]
+#[should_panic(expected: 'Pausable: not paused')]
 fn test_assert_paused_when_not_paused() {
     let state = COMPONENT_STATE();
     state.assert_paused();
@@ -53,7 +53,7 @@ fn test_assert_paused_when_not_paused() {
 //
 
 #[test]
-#[should_panic(expected: ('Pausable: paused',))]
+#[should_panic(expected: 'Pausable: paused')]
 fn test_assert_not_paused_when_paused() {
     let mut state = COMPONENT_STATE();
     state.pause();
@@ -84,7 +84,7 @@ fn test_pause_when_unpaused() {
 }
 
 #[test]
-#[should_panic(expected: ('Pausable: paused',))]
+#[should_panic(expected: 'Pausable: paused')]
 fn test_pause_when_paused() {
     let mut state = COMPONENT_STATE();
     state.pause();
@@ -111,7 +111,7 @@ fn test_unpause_when_paused() {
 }
 
 #[test]
-#[should_panic(expected: ('Pausable: not paused',))]
+#[should_panic(expected: 'Pausable: not paused')]
 fn test_unpause_when_unpaused() {
     let mut state = COMPONENT_STATE();
     assert!(!state.is_paused());
diff --git a/packages/security/src/tests/test_reentrancyguard.cairo b/packages/security/src/tests/test_reentrancyguard.cairo
index 8647c9e9e..3263e77a4 100644
--- a/packages/security/src/tests/test_reentrancyguard.cairo
+++ b/packages/security/src/tests/test_reentrancyguard.cairo
@@ -36,7 +36,7 @@ fn test_reentrancy_guard_start() {
 }
 
 #[test]
-#[should_panic(expected: ('ReentrancyGuard: reentrant call',))]
+#[should_panic(expected: 'ReentrancyGuard: reentrant call')]
 fn test_reentrancy_guard_start_when_started() {
     let mut state = COMPONENT_STATE();
 
@@ -64,7 +64,7 @@ fn test_reentrancy_guard_end() {
 //
 
 #[test]
-#[should_panic(expected: ('ReentrancyGuard: reentrant call',))]
+#[should_panic(expected: 'ReentrancyGuard: reentrant call')]
 fn test_remote_callback() {
     let contract = deploy_mock();
 
@@ -76,14 +76,14 @@ fn test_remote_callback() {
 }
 
 #[test]
-#[should_panic(expected: ('ReentrancyGuard: reentrant call',))]
+#[should_panic(expected: 'ReentrancyGuard: reentrant call')]
 fn test_local_recursion() {
     let contract = deploy_mock();
     contract.count_local_recursive(10);
 }
 
 #[test]
-#[should_panic(expected: ('ReentrancyGuard: reentrant call',))]
+#[should_panic(expected: 'ReentrancyGuard: reentrant call')]
 fn test_external_recursion() {
     let contract = deploy_mock();
     contract.count_external_recursive(10);