diff --git a/utils/yangutils/src/test/java/org/onosproject/yangutils/parser/impl/listeners/MinElementsListenerTest.java b/utils/yangutils/src/test/java/org/onosproject/yangutils/parser/impl/listeners/MinElementsListenerTest.java
index 2251082..a5dca38 100644
--- a/utils/yangutils/src/test/java/org/onosproject/yangutils/parser/impl/listeners/MinElementsListenerTest.java
+++ b/utils/yangutils/src/test/java/org/onosproject/yangutils/parser/impl/listeners/MinElementsListenerTest.java
@@ -16,21 +16,20 @@
 
 package org.onosproject.yangutils.parser.impl.listeners;
 
+import java.io.IOException;
+import java.util.ListIterator;
+
 import org.junit.Rule;
 import org.junit.Test;
-
 import org.junit.rules.ExpectedException;
 import org.onosproject.yangutils.datamodel.YangLeafList;
+import org.onosproject.yangutils.datamodel.YangList;
 import org.onosproject.yangutils.datamodel.YangModule;
 import org.onosproject.yangutils.datamodel.YangNode;
 import org.onosproject.yangutils.datamodel.YangNodeType;
-import org.onosproject.yangutils.datamodel.YangList;
 import org.onosproject.yangutils.parser.exceptions.ParserException;
 import org.onosproject.yangutils.parser.impl.YangUtilsParserManager;
 
-import java.io.IOException;
-import java.util.ListIterator;
-
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 
@@ -62,8 +61,8 @@
         YangModule yangNode = (YangModule) node;
         assertThat(yangNode.getName(), is("Test"));
 
-        ListIterator<YangLeafList<?>> leafListIterator = yangNode.getListOfLeafList().listIterator();
-        YangLeafList<?> leafListInfo = leafListIterator.next();
+        ListIterator<YangLeafList> leafListIterator = yangNode.getListOfLeafList().listIterator();
+        YangLeafList leafListInfo = leafListIterator.next();
 
         assertThat(leafListInfo.getLeafName(), is("invalid-interval"));
         assertThat(leafListInfo.getMinElements(), is(3));
@@ -93,8 +92,8 @@
     }
 
     /**
-     * Checks whether exception is thrown when invalid min-elements keyword
-     * is given as input.
+     * Checks whether exception is thrown when invalid min-elements keyword is
+     * given as input.
      */
     @Test
     public void processMinElementsInvalidKeyword() throws IOException, ParserException {
@@ -106,8 +105,8 @@
     }
 
     /**
-     * Checks whether exception is thrown when invalid min-elements value
-     * is given as input.
+     * Checks whether exception is thrown when invalid min-elements value is
+     * given as input.
      */
     @Test
     public void processMinElementsInvalidValue() throws IOException, ParserException {
@@ -117,8 +116,8 @@
     }
 
     /**
-     * Checks whether exception is thrown when min-elements statement without statement
-     * end is given as input.
+     * Checks whether exception is thrown when min-elements statement without
+     * statement end is given as input.
      */
     @Test
     public void processMinElementsWithoutStatementEnd() throws IOException, ParserException {
