diff --git a/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/security/AuthFilter.java b/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/security/AuthFilter.java
index dcfa4dbf1..3982396f8 100644
--- a/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/security/AuthFilter.java
+++ b/gateway/enforcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/security/AuthFilter.java
@@ -25,7 +25,12 @@
 import org.wso2.apk.enforcer.commons.exception.APISecurityException;
 import org.wso2.apk.enforcer.commons.logging.ErrorDetails;
 import org.wso2.apk.enforcer.commons.logging.LoggingConstants;
-import org.wso2.apk.enforcer.commons.model.*;
+import org.wso2.apk.enforcer.commons.model.APIConfig;
+import org.wso2.apk.enforcer.commons.model.APIKeyAuthenticationConfig;
+import org.wso2.apk.enforcer.commons.model.AuthenticationContext;
+import org.wso2.apk.enforcer.commons.model.JWTAuthenticationConfig;
+import org.wso2.apk.enforcer.commons.model.Oauth2AuthenticationConfig;
+import org.wso2.apk.enforcer.commons.model.RequestContext;
 import org.wso2.apk.enforcer.config.ConfigHolder;
 import org.wso2.apk.enforcer.config.EnforcerConfig;
 import org.wso2.apk.enforcer.config.dto.MutualSSLDto;
diff --git a/test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Mandatory.feature b/test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Mandatory.feature
index 5de7ed346..1f6cc149a 100644
--- a/test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Mandatory.feature
+++ b/test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Mandatory.feature
@@ -1,5 +1,4 @@
 Feature: Test mTLS between client and gateway with client certificate sent in header
-
     # mTLS mandatory OAuth2 mandatory
     Scenario: Test mandatory mTLS and mandatory OAuth2 with a valid client certificate in header
         Given The system is ready
diff --git a/test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Optional.feature b/test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Optional.feature
index 5b163f45e..e17fd6030 100644
--- a/test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Optional.feature
+++ b/test/cucumber-tests/src/test/resources/tests/api/MTLSwithOAuth2Optional.feature
@@ -1,5 +1,4 @@
 Feature: Test mTLS between client and gateway with client certificate sent in header with OAuth2 optional
-
     # mTLS mandatory OAuth2 optional
     Scenario: Test mandatory mTLS and optional OAuth2 with a valid client certificate in header
         Given The system is ready