diff --git a/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/SmartContractClientImplTest.java b/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/SmartContractClientImplTest.java
new file mode 100644
index 00000000..04cd5363
--- /dev/null
+++ b/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/SmartContractClientImplTest.java
@@ -0,0 +1,195 @@
+package com.openelements.hiero.base.test;
+
+import com.hedera.hashgraph.sdk.ContractId;
+import com.hedera.hashgraph.sdk.FileId;
+import com.openelements.hiero.base.FileClient;
+import com.openelements.hiero.base.HieroException;
+import com.openelements.hiero.base.data.ContractParam;
+import com.openelements.hiero.base.implementation.SmartContractClientImpl;
+import com.openelements.hiero.base.protocol.ProtocolLayerClient;
+import com.openelements.hiero.base.protocol.data.ContractCreateRequest;
+import com.openelements.hiero.base.protocol.data.ContractCreateResult;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.verify;
+
+
+public class SmartContractClientImplTest {
+
+    @Mock
+    private FileClient fileClient;
+
+    @Mock
+    private ProtocolLayerClient protocolLayerClient;
+
+    @InjectMocks
+    private SmartContractClientImpl smartContractClient;
+
+    private ContractId returnedContractId;
+
+    private ContractId contractId;
+
+    private FileId fileId;
+
+    private ContractParam<?> constructorParams;
+
+    private ContractCreateResult resultMock;
+
+    private Path tempPath;
+
+    private byte[] contents;
+
+
+    @BeforeEach
+    public void init() throws IOException {
+        fileClient = Mockito.mock(FileClient.class);
+        protocolLayerClient = Mockito.mock(ProtocolLayerClient.class);
+        smartContractClient = Mockito.spy(new SmartContractClientImpl(protocolLayerClient, fileClient));
+        contractId = ContractId.fromString("0.0.123");
+        fileId = FileId.fromString("0.0.123");
+        constructorParams = ContractParam.string("paramValue");
+        resultMock = Mockito.mock(ContractCreateResult.class);
+        tempPath= Files.createTempFile("testContract", ".bin");
+        contents = "contractBytecode".getBytes();
+        Files.write(tempPath, contents);
+
+    }
+
+    @AfterEach
+    public void doCleanUp() throws IOException{
+        Files.deleteIfExists(tempPath);
+    }
+
+    @Test
+    public void testCreateContract_UsingFileId_WithContractParams() throws HieroException {
+
+        when(resultMock.contractId()).thenReturn(contractId);
+        when(protocolLayerClient.executeContractCreateTransaction(any(ContractCreateRequest.class))).thenReturn(resultMock);
+
+        returnedContractId = smartContractClient.createContract(fileId, constructorParams);
+
+        assertEquals(contractId, returnedContractId);
+        verify(protocolLayerClient).executeContractCreateTransaction(any());
+
+    }
+
+    @Test
+    public void testCreateContract_UsingFileId_WithOutContractParams() throws HieroException {
+
+        when(resultMock.contractId()).thenReturn(contractId);
+        when(protocolLayerClient.executeContractCreateTransaction(any(ContractCreateRequest.class))).thenReturn(resultMock);
+
+        returnedContractId = smartContractClient.createContract(fileId);
+
+        assertEquals(contractId, returnedContractId);
+        verify(protocolLayerClient).executeContractCreateTransaction(any());
+    }
+
+    @Test
+    public void testCreateContract_UsingFileId_ThrowsException() throws HieroException {
+
+        when(protocolLayerClient.executeContractCreateTransaction(Mockito.any())).thenThrow(new RuntimeException("Failed"));
+        HieroException hieroException = assertThrows(HieroException.class, () -> smartContractClient.createContract(fileId, constructorParams));
+
+        assertTrue(hieroException.getMessage().contains("Failed to create contract with fileId " + fileId));
+    }
+
+    @Test
+    public void testCreateContract_UsingContents_WithContractParams() throws HieroException {
+
+        when(fileClient.createFile(contents)).thenReturn(fileId);
+        when(protocolLayerClient.executeContractCreateTransaction(any(ContractCreateRequest.class))).thenReturn(resultMock);
+        when(resultMock.contractId()).thenReturn(contractId);
+
+        returnedContractId = smartContractClient.createContract(contents, constructorParams);
+
+        assertEquals(contractId, returnedContractId);
+
+        verify(fileClient).createFile(contents);
+        verify(protocolLayerClient).executeContractCreateTransaction(any());
+        verify(fileClient).deleteFile(fileId);
+
+    }
+
+    @Test
+    public void testCreateContract_UsingContents_WithOutContractParams() throws HieroException {
+
+        when(fileClient.createFile(contents)).thenReturn(fileId);
+        when(protocolLayerClient.executeContractCreateTransaction(any(ContractCreateRequest.class))).thenReturn(resultMock);
+        when(resultMock.contractId()).thenReturn(contractId);
+
+        returnedContractId = smartContractClient.createContract(contents);
+
+        assertEquals(contractId, returnedContractId);
+
+        verify(fileClient).createFile(contents);
+        verify(protocolLayerClient).executeContractCreateTransaction(any());
+        verify(fileClient).deleteFile(fileId);
+    }
+
+    @Test
+    public void testCreateContract_UsingContents_ThrowsException() throws HieroException {
+        when(protocolLayerClient.executeContractCreateTransaction(Mockito.any())).thenThrow(new RuntimeException("Failed"));
+        HieroException hieroException = assertThrows(HieroException.class, () -> smartContractClient.createContract(contents, constructorParams));
+
+        assertTrue(hieroException.getMessage().contains("Failed to create contract out of byte array"));
+
+    }
+
+    @Test
+    public void testCreateContract_UsingPath_WithContractParams() throws HieroException, IOException {
+
+        when(fileClient.createFile(contents)).thenReturn(fileId);
+        when(protocolLayerClient.executeContractCreateTransaction(any(ContractCreateRequest.class))).thenReturn(resultMock);
+        when(resultMock.contractId()).thenReturn(contractId);
+
+        returnedContractId= smartContractClient.createContract(Files.readAllBytes(tempPath), constructorParams);
+
+        assertNotNull(returnedContractId);
+        assertEquals(contractId, returnedContractId);
+
+        verify(fileClient).createFile(contents);
+        verify(protocolLayerClient).executeContractCreateTransaction(any(ContractCreateRequest.class));
+        verify(fileClient).deleteFile(fileId);
+
+    }
+
+    @Test
+    public void testCreateContract_UsingPath_WithOutContractParams() throws HieroException, IOException {
+        when(fileClient.createFile(contents)).thenReturn(fileId);
+        when(protocolLayerClient.executeContractCreateTransaction(any(ContractCreateRequest.class))).thenReturn(resultMock);
+        when(resultMock.contractId()).thenReturn(contractId);
+
+        returnedContractId= smartContractClient.createContract(Files.readAllBytes(tempPath));
+
+        assertNotNull(returnedContractId);
+        assertEquals(contractId, returnedContractId);
+
+        verify(fileClient).createFile(contents);
+        verify(protocolLayerClient).executeContractCreateTransaction(any(ContractCreateRequest.class));
+        verify(fileClient).deleteFile(fileId);
+    }
+
+    @Test
+    public void testCreateContract_UsingPath_ThrowsException() throws HieroException {
+        when(protocolLayerClient.executeContractCreateTransaction(Mockito.any())).thenThrow(new RuntimeException("Failed"));
+        HieroException hieroException = assertThrows(HieroException.class, () -> smartContractClient.createContract(tempPath, constructorParams));
+
+        assertTrue(hieroException.getMessage().contains("Failed to create contract from path " + tempPath));
+    }
+}
diff --git a/hiero-enterprise-microprofile/src/main/java/com/openelements/hiero/microprofile/ClientProvider.java b/hiero-enterprise-microprofile/src/main/java/com/openelements/hiero/microprofile/ClientProvider.java
index 8ed8ea38..c5a55bbf 100644
--- a/hiero-enterprise-microprofile/src/main/java/com/openelements/hiero/microprofile/ClientProvider.java
+++ b/hiero-enterprise-microprofile/src/main/java/com/openelements/hiero/microprofile/ClientProvider.java
@@ -1,11 +1,11 @@
 package com.openelements.hiero.microprofile;
 
-import com.openelements.hiero.base.AccountClient;
 import com.openelements.hiero.base.FileClient;
 import com.openelements.hiero.base.FungibleTokenClient;
 import com.openelements.hiero.base.HieroContext;
 import com.openelements.hiero.base.NftClient;
 import com.openelements.hiero.base.SmartContractClient;
+import com.openelements.hiero.base.AccountClient;
 import com.openelements.hiero.base.config.HieroConfig;
 import com.openelements.hiero.base.implementation.AccountClientImpl;
 import com.openelements.hiero.base.implementation.AccountRepositoryImpl;
diff --git a/hiero-enterprise-spring/src/main/java/com/openelements/hiero/spring/implementation/HieroAutoConfiguration.java b/hiero-enterprise-spring/src/main/java/com/openelements/hiero/spring/implementation/HieroAutoConfiguration.java
index 35879b71..16a520e3 100644
--- a/hiero-enterprise-spring/src/main/java/com/openelements/hiero/spring/implementation/HieroAutoConfiguration.java
+++ b/hiero-enterprise-spring/src/main/java/com/openelements/hiero/spring/implementation/HieroAutoConfiguration.java
@@ -1,11 +1,11 @@
 package com.openelements.hiero.spring.implementation;
 
 import com.openelements.hiero.base.AccountClient;
-import com.openelements.hiero.base.FileClient;
 import com.openelements.hiero.base.FungibleTokenClient;
+import com.openelements.hiero.base.SmartContractClient;
+import com.openelements.hiero.base.FileClient;
 import com.openelements.hiero.base.HieroContext;
 import com.openelements.hiero.base.NftClient;
-import com.openelements.hiero.base.SmartContractClient;
 import com.openelements.hiero.base.TopicClient;
 import com.openelements.hiero.base.config.HieroConfig;
 import com.openelements.hiero.base.implementation.AccountClientImpl;