diff --git a/smp-ui-tests/src/main/java/pages/components/GenericSelect.java b/smp-ui-tests/src/main/java/pages/components/GenericSelect.java
index 4f19827fe2cea815bb10ccb530b085934c7a5fe7..8382a2b76219f1e5213aa678fbc6330d8270c8d0 100644
--- a/smp-ui-tests/src/main/java/pages/components/GenericSelect.java
+++ b/smp-ui-tests/src/main/java/pages/components/GenericSelect.java
@@ -83,7 +83,7 @@ public class GenericSelect extends PageComponent {
 		return true;
 	}
 	public boolean selectWithIndex(int index){
-		log.info("selecting first option");
+		log.info("selecting the required option");
 		List<WebElement> options = getOptions();
 
 		WebElement option = options.get(index);
diff --git a/smp-ui-tests/src/main/java/pages/service_groups/edit/ServiceMetadataPopup.java b/smp-ui-tests/src/main/java/pages/service_groups/edit/ServiceMetadataPopup.java
index 6b450c0bf1242a09ac3453fd393e6e630f0cffe9..0b98f19153ad4469ed169d93140ec628ce2ea735 100644
--- a/smp-ui-tests/src/main/java/pages/service_groups/edit/ServiceMetadataPopup.java
+++ b/smp-ui-tests/src/main/java/pages/service_groups/edit/ServiceMetadataPopup.java
@@ -85,11 +85,11 @@ public class ServiceMetadataPopup extends PageComponent {
 	}
 
 
-	public String docIDFieldContain(){
+	public String docIDFieldValue(){
 		return documentIdentifierInput.getAttribute("value");
 	}
 
-	public String docIDSchemeFieldContain(){
+	public String docIDSchemeFieldValue(){
 		return documentSchemeInput.getAttribute("value");
 	}
 
diff --git a/smp-ui-tests/src/main/java/pages/service_groups/edit/ServiceMetadataWizardPopup.java b/smp-ui-tests/src/main/java/pages/service_groups/edit/ServiceMetadataWizardPopup.java
index 4b97285614de9c46291b7ef32d21f2a7fd9647d0..7bc5a30921f212f7f0cefa3c1b951b2d44ee2cde 100644
--- a/smp-ui-tests/src/main/java/pages/service_groups/edit/ServiceMetadataWizardPopup.java
+++ b/smp-ui-tests/src/main/java/pages/service_groups/edit/ServiceMetadataWizardPopup.java
@@ -6,7 +6,6 @@ import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.PageFactory;
 import org.openqa.selenium.support.pagefactory.AjaxElementLocatorFactory;
 import pages.components.baseComponents.PageComponent;
-import utils.Generator;
 import utils.PROPERTIES;
 
 import java.io.File;
@@ -48,11 +47,11 @@ public class ServiceMetadataWizardPopup extends PageComponent {
     private WebElement certificateDescriptionBox;
 
 
-    public String docIDFieldContain(){
+    public String docIDFieldValue(){
        return docIdField.getAttribute("value");
     }
 
-    public String docIDSchemeFieldContain(){
+    public String docIDSchemeFieldValue(){
         return docIdSchemeField.getAttribute("value");
     }
 
diff --git a/smp-ui-tests/src/test/java/ui/EditPgTest.java b/smp-ui-tests/src/test/java/ui/EditPgTest.java
index 9da5dca7d054300fc363a71acfac7b140a161443..69f93b1338982127aa805e1454eac261f387f5e6 100644
--- a/smp-ui-tests/src/test/java/ui/EditPgTest.java
+++ b/smp-ui-tests/src/test/java/ui/EditPgTest.java
@@ -384,8 +384,8 @@ public class EditPgTest extends BaseTest {
 		ServiceMetadataPopup metadataPopup= row0.clickAddMetadata();
 		soft.assertTrue(!metadataPopup.isParticipantIdentifierEnabled(),"participantId field is enabled for an existing service group in service metadata popup");
 		soft.assertTrue(!metadataPopup.isParticipantSchemeEnabled(),"participantScheme field is enabled for an existing service group in service metadata popup");
-		soft.assertEquals(metadataPopup.docIDFieldContain(),"","docIDField is not empty");
-		soft.assertEquals(metadataPopup.docIDSchemeFieldContain(),"","docIDField is not empty");
+		soft.assertEquals(metadataPopup.docIDFieldValue(),"","docIDField is not empty");
+		soft.assertEquals(metadataPopup.docIDSchemeFieldValue(),"","docIDField is not empty");
 		soft.assertTrue(row0.getParticipantIdentifier().equalsIgnoreCase(metadataPopup.getParticipantIdentifierValue()), "ServiceMetadata dialog opened for appropriate service group");
 		soft.assertTrue(row0.getParticipantScheme().equalsIgnoreCase(metadataPopup.getParticipantSchemeValue()), "ServiceMetadata dialog opened for appropriate service group");
 		metadataPopup.fillForm(generator,generator,generator);
@@ -394,8 +394,8 @@ public class EditPgTest extends BaseTest {
 		metadataWizaedPopup.fillCerificateBox(generator);
 		soft.assertTrue(metadataWizaedPopup.isEnableOkBtn(),"ok button is disabled after providing the valid data");
 		metadataPopup = metadataWizaedPopup.clickOK();
-		soft.assertEquals(metadataPopup.docIDFieldContain(),generator,"After saving the servicemetadata wizard popup with valid data the docID field of service metadata popup doc id contain the coressponding value");
-		soft.assertEquals(metadataPopup.docIDSchemeFieldContain(),generator,"After saving the servicemetadata wizard popup with valid data the docIDScheme field of service metadata popup doc id scheme contain the coressponding value");
+		soft.assertEquals(metadataPopup.docIDFieldValue(),generator,"After saving the servicemetadata wizard popup with valid data the docID field of service metadata popup doc id contain the coressponding value");
+		soft.assertEquals(metadataPopup.docIDSchemeFieldValue(),generator,"After saving the servicemetadata wizard popup with valid data the docIDScheme field of service metadata popup doc id scheme contain the coressponding value");
 		soft.assertTrue(metadataPopup.isOKBtnEnabled(),"OK button is not enabled");
 		soft.assertAll();
 
@@ -414,8 +414,8 @@ public class EditPgTest extends BaseTest {
 		soft.assertTrue(!metadataPopup.isParticipantSchemeEnabled(),"participantScheme field is enabled for an existing service group in service metadata popup");
 		metadataPopup.fillForm(generator,generator,generator);
 		ServiceMetadataWizardPopup metadataWizard= metadataPopup.clickMetadataWizard();
-		soft.assertEquals(metadataWizard.docIDFieldContain(),generator,"document identifier field of metdata wizard popup not contain the corresponding doc id filled in sevice metadata popup");
-		soft.assertEquals(metadataWizard.docIDSchemeFieldContain(),generator,"document identifier field of metdata wizard popup not contain the corresponding doc id scheme filled in sevice metadata popup");
+		soft.assertEquals(metadataWizard.docIDFieldValue(),generator,"document identifier field of metdata wizard popup not contain the corresponding doc id filled in sevice metadata popup");
+		soft.assertEquals(metadataWizard.docIDSchemeFieldValue(),generator,"document identifier field of metdata wizard popup not contain the corresponding doc id scheme filled in sevice metadata popup");
 		soft.assertAll();
 	}