diff --git a/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/AccountClientImplTest.java b/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/AccountClientImplTest.java
index 2a7641d2..0dd1e44c 100644
--- a/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/AccountClientImplTest.java
+++ b/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/AccountClientImplTest.java
@@ -30,7 +30,7 @@ public void setUp() {
     }
 
     @Test
-    public void testGetAccountBalance_ValidPositiveBalance() throws HieroException {
+    public void testGetAccountBalanceValidPositiveBalance() throws HieroException {
         AccountId accountId = AccountId.fromString("0.0.12345");
         Hbar expectedBalance = new Hbar(10);
 
@@ -48,7 +48,7 @@ public void testGetAccountBalance_ValidPositiveBalance() throws HieroException {
     }
 
     @Test
-    public void testGetAccountBalance_ZeroBalance() throws HieroException {
+    public void testGetAccountBalanceZeroBalance() throws HieroException {
         AccountId accountId = AccountId.fromString("0.0.67890");
         Hbar expectedBalance = new Hbar(0);
 
@@ -65,7 +65,7 @@ public void testGetAccountBalance_ZeroBalance() throws HieroException {
     }
 
     @Test
-    public void testGetAccountBalance_InvalidAccount_ThrowsException() throws HieroException {
+    public void testGetAccountBalanceInvalidAccountThrowsException() throws HieroException {
         AccountId invalidAccountId = AccountId.fromString("0.0.9999999");
 
         when(mockProtocolLayerClient.executeAccountBalanceQuery(
@@ -78,14 +78,14 @@ public void testGetAccountBalance_InvalidAccount_ThrowsException() throws HieroE
     }
 
     @Test
-    public void testGetAccountBalance_NullThrowsException() {
+    public void testGetAccountBalanceNullThrowsException() {
         assertThrows(NullPointerException.class, () -> {
             accountClientImpl.getAccountBalance((AccountId) null);
         });
     }
 
     @Test
-    public void testGetAccountBalance_ProtocolLayerClientFails() throws HieroException {
+    public void testGetAccountBalanceProtocolLayerClientFails() throws HieroException {
         AccountId accountId = AccountId.fromString("0.0.12345");
 
         when(mockProtocolLayerClient.executeAccountBalanceQuery(
@@ -99,7 +99,7 @@ public void testGetAccountBalance_ProtocolLayerClientFails() throws HieroExcepti
 
     //tests for createAccount method
     @Test
-    void testCreateAccount_successful() throws HieroException {
+    void testCreateAccountSuccessful() throws HieroException {
         Hbar initialBalance = Hbar.from(100);
 
         AccountCreateResult mockResult = mock(AccountCreateResult.class);
@@ -119,7 +119,7 @@ void testCreateAccount_successful() throws HieroException {
     }
 
     @Test
-    void testCreateAccount_invalidInitialBalance_null() {
+    void testCreateAccountInvalidInitialBalanceNull() {
         Hbar initialBalance = null;
 
         assertThrows(NullPointerException.class, () -> accountClientImpl.createAccount(initialBalance));
@@ -136,7 +136,7 @@ void testCreateAccount_invalidInitialBalance_negative() {
 
 
     @Test
-    void testCreateAccount_hieroExceptionThrown() throws HieroException {
+    void testCreateAccountHieroExceptionThrown() throws HieroException {
         Hbar initialBalance = Hbar.from(100);
 
         when(mockProtocolLayerClient.executeAccountCreateTransaction(any(AccountCreateRequest.class)))