diff --git a/java/registry/src/main/resources/application.yml b/java/registry/src/main/resources/application.yml
index 09eebfab1..5b709c9bf 100644
--- a/java/registry/src/main/resources/application.yml
+++ b/java/registry/src/main/resources/application.yml
@@ -474,12 +474,12 @@ signature:
 # suffixSeperator : specifies the separator used between entity name and suffix. If audit schema name is Teacher_Audit.json, the suffixSeperator is _.
 
 audit:
-  enabled: ${audit_enabled:false}
-  vc-enabled: ${audit_vc_enabled:false}
+  enabled: true
+  vc-enabled: true
   frame:
-    store: ${audit_frame_store:DATABASE}
-    suffix: ${audit_suffix:Audit}
-    suffixSeparator: ${audit_suffixSeparator:_}
+    store: DATABASE
+    suffix: Audit
+    suffixSeparator: _
 
 authentication:
   enabled: ${authentication_enabled:true}
diff --git a/java/registry/src/test/java/dev/sunbirdrc/registry/service/impl/AuditServiceImplTest.java b/java/registry/src/test/java/dev/sunbirdrc/registry/service/impl/AuditServiceImplTest.java
new file mode 100644
index 000000000..fc96f4d03
--- /dev/null
+++ b/java/registry/src/test/java/dev/sunbirdrc/registry/service/impl/AuditServiceImplTest.java
@@ -0,0 +1,186 @@
+package dev.sunbirdrc.registry.service.impl;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import dev.sunbirdrc.pojos.AuditInfo;
+import dev.sunbirdrc.pojos.AuditRecord;
+import dev.sunbirdrc.registry.exception.AuditFailedException;
+import dev.sunbirdrc.registry.helper.SignatureHelper;
+import dev.sunbirdrc.registry.middleware.util.Constants;
+import dev.sunbirdrc.registry.service.IAuditService;
+import dev.sunbirdrc.registry.sink.shard.Shard;
+import dev.sunbirdrc.registry.util.Definition;
+import dev.sunbirdrc.registry.util.IDefinitionsManager;
+import dev.sunbirdrc.registry.util.OSSystemFieldsHelper;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.List;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = {ObjectMapper.class})
+@ActiveProfiles(Constants.TEST_ENVIRONMENT)
+public class AuditServiceImplTest {
+
+    @Value("${audit.enabled}")
+    private boolean auditEnabled;
+
+    @Value("${audit.frame.store}")
+    private String auditFrameStore;
+
+    @Value("${audit.frame.suffix}")
+    private String auditSuffix;
+
+    @Value("${audit.frame.suffixSeparator}")
+    private String auditSuffixSeparator;
+
+    @Value("${audit.vc-enabled:false}")
+    private boolean auditVCEnabled;
+
+    @Mock
+    private IDefinitionsManager definitionsManager;
+
+    @Mock
+    private OSSystemFieldsHelper systemFieldsHelper;
+
+    @Mock
+    private AuditProviderFactory auditProviderFactory;
+
+    @Mock
+    private SignatureHelper signatureHelper;
+
+    @Mock
+    private ObjectMapper objectMapper;
+
+    @InjectMocks
+    private AuditServiceImpl auditService;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        setField(auditService, "auditEnabled", auditEnabled);
+        setField(auditService, "auditFrameStore", auditFrameStore);
+        setField(auditService, "auditSuffix", auditSuffix);
+        setField(auditService, "auditSuffixSeparator", auditSuffixSeparator);
+        setField(auditService, "auditVCEnabled", auditVCEnabled);
+    }
+
+    private void setField(Object targetObject, String fieldName, Object value) throws Exception {
+        Field field = targetObject.getClass().getDeclaredField(fieldName);
+        field.setAccessible(true);
+        field.set(targetObject, value);
+    }
+
+    @Test
+    public void shouldAudit_ReturnsTrueWhenFileAuditEnabled() throws Exception {
+        setField(auditService, "auditFrameStore", Constants.FILE);
+        boolean result = auditService.shouldAudit("EntityType");
+        assertTrue(result);
+    }
+
+    @Test
+    public void shouldAudit_ReturnsTrueWhenDBAuditEnabledAndDefinitionNotNull() throws Exception {
+        when(definitionsManager.getDefinition(anyString())).thenReturn(mock(Definition.class));
+        setField(auditService, "auditFrameStore", Constants.DATABASE);
+        boolean result = auditService.shouldAudit("EntityType");
+        assertTrue(result);
+    }
+
+    @Test
+    public void shouldAudit_ReturnsFalseWhenNoAuditingEnabled() throws Exception {
+        setField(auditService, "auditEnabled", false);
+        boolean result = auditService.shouldAudit("EntityType");
+        assertFalse(result);
+    }
+
+    @Test
+    public void isAuditAction_ReturnsAuditActionForMatchingSuffix() {
+        String entityType = auditSuffix;
+        String action = auditService.isAuditAction(entityType);
+        assertEquals(Constants.AUDIT_ACTION_AUDIT, action);
+    }
+
+    @Test
+    public void isAuditAction_ReturnsSearchActionForNonMatchingSuffix() {
+        String entityType = "NonMatchingEntity";
+        String action = auditService.isAuditAction(entityType);
+        assertEquals(Constants.AUDIT_ACTION_SEARCH, action);
+    }
+
+    @Test
+    public void createAuditInfo_ReturnsAuditInfoList() {
+        String auditAction = "AuditAction";
+        String entityType = "EntityType";
+        List<AuditInfo> auditInfoList = auditService.createAuditInfo(auditAction, entityType);
+
+        // Then
+        assertEquals(1, auditInfoList.size());
+        assertEquals(auditAction, auditInfoList.get(0).getOp());
+        assertEquals("/" + entityType, auditInfoList.get(0).getPath());
+    }
+
+    @Test
+    public void convertAuditRecordToJson_ReturnsJsonNode() throws IOException {
+        // Given
+        AuditRecord auditRecord = new AuditRecord();
+        JsonNode inputNode = mock(JsonNode.class);
+        Shard shard = mock(Shard.class);
+        String vertexLabel = "VertexLabel";
+        when(objectMapper.writeValueAsString(any())).thenReturn("{}");
+
+        // When
+        JsonNode result = auditService.convertAuditRecordToJson(auditRecord, vertexLabel);
+
+        // Then
+        assertNotNull(result);
+        assertTrue(result.has(vertexLabel));
+    }
+
+    @Test
+    public void createAuditInfoWithJson_ReturnsAuditInfoListFromJson() throws JsonProcessingException {
+        // Given
+        String auditAction = "AuditAction";
+        JsonNode differenceJson = mock(JsonNode.class);
+        String entityType = "EntityType";
+        when(objectMapper.treeToValue(any(JsonNode.class), eq(AuditInfo[].class)))
+                .thenReturn(new AuditInfo[]{new AuditInfo()});
+
+        // When
+        List<AuditInfo> auditInfoList = auditService.createAuditInfoWithJson(auditAction, differenceJson, entityType);
+
+        // Then
+        assertNotNull(auditInfoList);
+        assertEquals(1, auditInfoList.size());
+    }
+
+    @Test
+    public void testDoAudit() throws AuditFailedException {
+        // Given
+        AuditRecord auditRecord = mock(AuditRecord.class);
+        JsonNode inputNode = mock(JsonNode.class);
+        Shard shard = mock(Shard.class);
+        IAuditService auditProvider = mock(IAuditService.class);
+
+        when(auditProviderFactory.getAuditService(anyString())).thenReturn(auditProvider);
+
+        // When
+        auditService.doAudit(auditRecord, inputNode, shard);
+
+        // Then
+        verify(auditProvider, times(1)).doAudit(auditRecord, inputNode, shard);
+    }
+}
+