diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ExperimentBrowserTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ExperimentBrowserTest.java
index e642e5f1ac3ebb191d32049b9ff63d3bff467727..a9abcb67d8629f433de229df43c38966fc4d5608 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ExperimentBrowserTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ExperimentBrowserTest.java
@@ -43,7 +43,7 @@ public class ExperimentBrowserTest extends AbstractGWTTestCase
         table.expectedRow(new ExperimentRow("EXP-TEST-1", "COMPOUND_HCS").withUserPropertyCell(
                 "COMMENT", "cmnt")); // 'COMMENT' is assigned only to 'COMPOUND_HCS' experiment type
         table.expectedRow(new ExperimentRow("EXP-TEST-2", "SIRNA_HCS").withUserPropertyCell(
-                "GENDER", "[FEMALE]")); // 'GENDER' is assigned only to 'SIRNA_HCS' experiment type
+                "GENDER", "FEMALE")); // 'GENDER' is assigned only to 'SIRNA_HCS' experiment type
 
         table.expectedColumnsNumber(15);
         remoteConsole.prepare(table.expectedSize(5));
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/MaterialBrowserTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/MaterialBrowserTest.java
index 69c8f4718fb4b033ee358805a024f45bac0e0fca..a23693125797ff4527aa8663998e518c94e78524 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/MaterialBrowserTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/MaterialBrowserTest.java
@@ -36,7 +36,7 @@ public class MaterialBrowserTest extends AbstractGWTTestCase
 
         remoteConsole.prepare(new ListMaterials("BACTERIUM"));
         CheckMaterialTable table = new CheckMaterialTable();
-        table.expectedRow(new MaterialRow("BACTERIUM-X").withUserPropertyCell("ORGANISM", "[FLY]"));
+        table.expectedRow(new MaterialRow("BACTERIUM-X").withUserPropertyCell("ORGANISM", "FLY"));
         table.expectedRow(new MaterialRow("BACTERIUM-Y"));
         table.expectedRow(new MaterialRow("BACTERIUM1"));
         table.expectedRow(new MaterialRow("BACTERIUM2"));
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SampleBrowserTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SampleBrowserTest.java
index f3df5d43c9c201732652c6f23a355a45bbda39b4..20616386ba57545d56868a430d9d204b4313eddb 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SampleBrowserTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SampleBrowserTest.java
@@ -42,6 +42,8 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.Row;
 public class SampleBrowserTest extends AbstractGWTTestCase
 {
 
+    private static final String DEFAULT_PLATE_GEOMETRY_VALUE = "384_WELLS_16X24";
+
     public final void testChangeColumnSettings()
     {
         loginAndGotoListSamplesTab();
@@ -80,10 +82,10 @@ public class SampleBrowserTest extends AbstractGWTTestCase
 
         // 'ORGANISM' is assigned only to 'CELL_PLATE' sample type
         table.expectedRow(new SampleRow("CP-TEST-1", "CELL_PLATE").identifier("CISD", "CISD")
-                .withUserPropertyCell("ORGANISM", "[HUMAN]"));
+                .withUserPropertyCell("ORGANISM", "HUMAN"));
         // 'PLATE_GEOMETRY' is assigned only to 'CONTROL_LAYOUT' and 'MASTER PLATE' sample types
         table.expectedRow(new SampleRow("C1", "CONTROL_LAYOUT").identifier("CISD", "CISD")
-                .withInternalPropertyCell("PLATE_GEOMETRY", "[384_WELLS_16X24]"));
+                .withInternalPropertyCell("PLATE_GEOMETRY", DEFAULT_PLATE_GEOMETRY_VALUE));
 
         table.expectedColumnsNumber(19);
         remoteConsole.prepare(table.expectedSize(40));
@@ -99,9 +101,9 @@ public class SampleBrowserTest extends AbstractGWTTestCase
         table.expectedColumnHidden(CommonSampleColDefKind.CODE.name(), false);
         table.expectedColumnWidth(CommonSampleColDefKind.REGISTRATOR.name(), DEFAULT_COLUMN_WIDTH);
         table.expectedRow(new SampleRow("MP001-1").identifier("CISD", "CISD").invalid()
-                .noExperiment().withInternalPropertyCell("PLATE_GEOMETRY", "[384_WELLS_16X24]"));
+                .noExperiment().withInternalPropertyCell("PLATE_GEOMETRY", DEFAULT_PLATE_GEOMETRY_VALUE));
         table.expectedRow(new SampleRow("MP002-1").identifier("CISD", "CISD").valid()
-                .noExperiment().withInternalPropertyCell("PLATE_GEOMETRY", "[384_WELLS_16X24]"));
+                .noExperiment().withInternalPropertyCell("PLATE_GEOMETRY", DEFAULT_PLATE_GEOMETRY_VALUE));
         remoteConsole.prepare(table.expectedSize(5));
 
         launchTest(20000);
@@ -129,7 +131,7 @@ public class SampleBrowserTest extends AbstractGWTTestCase
         CheckSampleTable table = new CheckSampleTable();
         Row expectedRow =
                 new SampleRow("MP").identifier("CISD").valid().noExperiment()
-                        .withInternalPropertyCell("PLATE_GEOMETRY", "[384_WELLS_16X24]");
+                        .withInternalPropertyCell("PLATE_GEOMETRY", DEFAULT_PLATE_GEOMETRY_VALUE);
         table.expectedRow(expectedRow);
         remoteConsole.prepare(table.expectedSize(1));
 
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java
index 731dd3216bcb95e55220fca31207e8b5e44635bf..b8700047a94ac37b0f5e71e97f1931f1e055a0c4 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java
@@ -67,7 +67,7 @@ public class GenericSampleRegistrationTest extends AbstractGWTTestCase
         loginAndPreprareRegistration(sampleTypeCode);
         remoteConsole.prepare(new FillSampleRegistrationForm("CISD", GROUP_CL, true)
                 .addProperty(new PropertyField(GenericSampleRegistrationForm.ID + "plate-geometry",
-                        "[1536_WELLS_32X48]")));
+                        "1536_WELLS_32X48")));
         remoteConsole.prepare(new InvokeActionMenu(TopMenu.ActionMenuKind.SAMPLE_MENU_BROWSE,
                 GenericSampleRegistrationForm.RegisterSampleCallback.class));
         remoteConsole.prepare(new ListSamples("CISD", sampleTypeCode));
@@ -86,7 +86,7 @@ public class GenericSampleRegistrationTest extends AbstractGWTTestCase
         remoteConsole.prepare(new ChooseTypeOfNewSample(CONTROL_LAYOUT));
         remoteConsole.prepare(new FillSampleRegistrationForm("TESTGROUP", GROUP_CL + "1", true)
                 .addProperty(new PropertyField(GenericSampleRegistrationForm.ID + "plate-geometry",
-                        "[1536_WELLS_32X48]")));
+                        "1536_WELLS_32X48")));
         FailureExpectation failureExpectation =
                 new FailureExpectation(GenericSampleRegistrationForm.RegisterSampleCallback.class)
                         .with("Authorization failure: None of method roles "
@@ -143,7 +143,7 @@ public class GenericSampleRegistrationTest extends AbstractGWTTestCase
                 new PropertyField(GenericSampleRegistrationForm.ID + "user-description",
                         description)).addProperty(
                 new PropertyField(GenericSampleRegistrationForm.ID + "plate-geometry",
-                        "[1536_WELLS_32X48]")));
+                        "1536_WELLS_32X48")));
         remoteConsole.prepare(new InvokeActionMenu(TopMenu.ActionMenuKind.SAMPLE_MENU_BROWSE,
                 GenericSampleRegistrationForm.RegisterSampleCallback.class));
         remoteConsole.prepare(new ListSamples(GroupSelectionWidget.SHARED_GROUP_CODE,