diff --git a/components/org.wso2.carbon.identity.scim2.common/src/test/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManagerTest.java b/components/org.wso2.carbon.identity.scim2.common/src/test/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManagerTest.java
index bf3cf2e95..b64289b0e 100644
--- a/components/org.wso2.carbon.identity.scim2.common/src/test/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManagerTest.java
+++ b/components/org.wso2.carbon.identity.scim2.common/src/test/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManagerTest.java
@@ -495,7 +495,7 @@ public void testCursorFilteringUsersWithGET(String filter, int expectedResultCou
 
         mockedUserStoreManager = PowerMockito.mock(AbstractUserStoreManager.class);
 
-        //Cursor filtering
+        // Cursor filtering.
         when(mockedUserStoreManager.getUserListWithID(any(Condition.class), anyString(), anyString(), anyInt(),
                 anyString(), anyString(), anyString(), anyString())).thenReturn(filteredUsers);
 
@@ -589,7 +589,7 @@ public Object[][] userInfoForCursorFiltering() {
         fakeUser7.setAttributes(testUser7Attributes);
 
         return new Object[][]{
-                // Forwards pagination initial request
+                // Forwards pagination initial request.
                 {"name.givenName eq testUser", 4, new Cursor("", "NEXT"), 5,
                         new ArrayList<org.wso2.carbon.user.core.common.User>() {{
                             add(testUser1);
@@ -598,7 +598,7 @@ public Object[][] userInfoForCursorFiltering() {
                             add(testUser4);
                         }}},
 
-                // Forwards pagination without filtering
+                // Forwards pagination without filtering.
                 {null, 5, new Cursor("fakeUser6", "NEXT"), 5,
                         new ArrayList<org.wso2.carbon.user.core.common.User>() {{
                             add(fakeUser7);
@@ -608,7 +608,7 @@ public Object[][] userInfoForCursorFiltering() {
                             add(testUser4);
                         }}},
 
-                // Backwards pagination without filter
+                // Backwards pagination without filter.
                 {null, 4, new Cursor("testUser2", "PREVIOUS"), 5,
                         new ArrayList<org.wso2.carbon.user.core.common.User>() {{
                             add(fakeUser5);
@@ -617,28 +617,28 @@ public Object[][] userInfoForCursorFiltering() {
                             add(testUser1);
                         }}},
 
-                // Forwards pagination with a filter
+                // Forwards pagination with a filter.
                 {"name.givenName eq testUser", 2, new Cursor("testUser2", "NEXT"), 5,
                         new ArrayList<org.wso2.carbon.user.core.common.User>() {{
                             add(testUser3);
                             add(testUser4);
                         }}},
 
-                // Backwards pagination with a filter
+                // Backwards pagination with a filter.
                 {"name.givenName eq testUser", 2, new Cursor("testUser3", "PREVIOUS"), 5,
                         new ArrayList<org.wso2.carbon.user.core.common.User>() {{
                             add(testUser1);
                             add(testUser2);
                         }}},
 
-                // Multi-attribute filtering - Forwards pagination - With a count
+                // Multi-attribute filtering - Forwards pagination - With a count.
                 {"name.givenName eq testUser and emails co gmail", 2, new Cursor("", "NEXT"), 5,
                         new ArrayList<org.wso2.carbon.user.core.common.User>() {{
                             add(testUser1);
                             add(testUser3);
                         }}},
 
-                // Multi-attribute filtering - Backwards pagination
+                // Multi-attribute filtering - Backwards pagination.
                 {"name.givenName eq fakeUser and emails co wso2.com", 1,
                         new Cursor("fakeUser7", "PREVIOUS"), 5,
                         new ArrayList<org.wso2.carbon.user.core.common.User>() {{
@@ -646,19 +646,19 @@ public Object[][] userInfoForCursorFiltering() {
                         }}},
 
                 // Multi-attribute filtering - Forwards pagination - Without maxLimit calls
-                // getMultiAttributeFilteredUsersWithMaxLimit
+                // getMultiAttributeFilteredUsersWithMaxLimit.
                 {"name.givenName eq testUser and emails co gmail", 2, new Cursor("", "NEXT"), null,
                         new ArrayList<org.wso2.carbon.user.core.common.User>() {{
                             add(testUser1);
                             add(testUser3);
                         }}},
 
-                // Return empty list when count == 0
+                // Return empty list when count == 0.
                 {"", 0, new Cursor("", "NEXT"), 0,
                         new ArrayList<org.wso2.carbon.user.core.common.User>() {{
                         }}},
 
-                // Single attribute group filtering
+                // Single attribute group filtering.
                 {"groups eq Manager", 2, new Cursor("", "NEXT"), 5,
                         new ArrayList<org.wso2.carbon.user.core.common.User>() {{
                             add(testUser1);