diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/test/UserTests.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/test/UserTests.js
index 5d55a44310b39f201aa93f92e9532e99e0c8fe59..c487895ebc323be8c686dcb60e66ddfdec482977 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/test/UserTests.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/test/UserTests.js
@@ -7,8 +7,7 @@ var UserTests = new function() {
                  .then(() => TestUtil.login("testId", "pass"))
                  .then(() => this.inventorySpaceForTestUser())
                  //6. Sample Form - Creation
-                 //todo remove this comment before commit!
-                 //.then(() => this.creationSampleForm())
+                 .then(() => this.creationSampleForm())
                  //13. Inventory Table - Imports for Create - Automatic Codes
                  .then(() => this.importsAutomaticCodes())
                  //15. Sample Form - Storage
@@ -111,9 +110,15 @@ var UserTests = new function() {
                              .then(() => e.click("options-menu-btn"))
                              .then(() => e.waitForId("register-object-btn"))
                              .then(() => e.click("register-object-btn"))
-                             .then(() => e.waitForId("accept-type-file"))
+                             .then(() => e.waitForId("choose-type-btn"))
+                             .then(() => e.change("choose-type-btn", "BACTERIA", false))
                              .then(() => TestUtil.setFile("name", baseURL + pathToResource, "text"))
+                             .then(() => e.waitForId("accept-type-file"))
                              .then(() => e.click("accept-type-file"))
+                             .then(() => e.waitForId("bac5-column-id"))
+                             .then(() => e.waitForId("bac6-column-id"))
+                             .then(() => e.waitForId("bac7-column-id"))
+                             .then(() => e.waitForId("bac8-column-id"))
                              .then(() => resolve());
         });
     }
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/EventUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/EventUtil.js
index 6dacb4a00f234b99c7c24d5c3a2f317aac1bf5de..3f6f15107a570baf02ca501d367ba5409c2cfb61 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/EventUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/EventUtil.js
@@ -91,8 +91,6 @@ var EventUtil = new function() {
 
     this.waitForId = function(elementId, ignoreError, timeout) {
         return new Promise(function executor(resolve, reject) {
-            EventUtil.getElement(elementId, timeout, ignoreError, resolve, reject);
-
             if($("#" + elementId).length <= 0) {
                 setTimeout(executor.bind(null, resolve, reject), DEFAULT_TIMEOUT_STEP);
             } else {
@@ -103,8 +101,6 @@ var EventUtil = new function() {
 
     this.waitForFill = function(elementId, ignoreError, timeout) {
         return new Promise(function executor(resolve, reject) {
-            EventUtil.getElement(elementId, timeout, ignoreError, resolve, reject);
-
             var element = EventUtil.getElement(elementId, ignoreError, resolve);
             if(element.html().length <= 0 && element.val().length <= 0) {
                 setTimeout(executor.bind(null, resolve, reject), DEFAULT_TIMEOUT_STEP);
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
index 90e4cef2d10a5b9e9853ff1391b48c52c18d3240..717e059ae2946e7978eb752513a5c61e4f3602f7 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
@@ -43,7 +43,7 @@ var SampleDataGridUtil = new function() {
 				return sortDirection * naturalSort(value1, value2);
 			}
 		});
-		
+
 		columnsFirst.push({
 			label : 'Code',
 			property : 'code',
@@ -69,7 +69,10 @@ var SampleDataGridUtil = new function() {
 						}
 					}
 				}
-				return (isLinksDisabled)?data.code:FormUtil.getFormLink(data.code, "Sample", data.permId, paginationInfo);
+				var output = $("<span id = '" + data.code.toLowerCase() + "-column-id"+ "'>");
+				var eComponent = (isLinksDisabled)?data.code:FormUtil.getFormLink(data.code, "Sample", data.permId, paginationInfo);
+				output.append(eComponent);
+				return output;
 			},
 			filter : function(data, filter) {
 				return data.identifier.toLowerCase().indexOf(filter) !== -1;
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/widgets/TypeAndFileView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/widgets/TypeAndFileView.js
index d9371b7a3294ef44e578103be39a9ebc59921a95..ee499a3bad23684ff25175600af8d2a8faceb2ea 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/widgets/TypeAndFileView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/widgets/TypeAndFileView.js
@@ -30,7 +30,7 @@ function TypeAndFileView(typeAndFileController, typeAndFileModel) {
 		
 		$window.append($('<legend>').append(this._typeAndFileModel.title));
 
-		var $sampleTypeDropDown = FormUtil.getSampleTypeDropdown(null, true, this._typeAndFileModel.allowedSampleTypes, this._typeAndFileModel.allowedSampleTypes);
+		var $sampleTypeDropDown = FormUtil.getSampleTypeDropdown('choose-type-btn', true, this._typeAndFileModel.allowedSampleTypes, this._typeAndFileModel.allowedSampleTypes);
 		$sampleTypeDropDown.change(function(event) {
 			_this._typeAndFileModel.sampleTypeCode = $(this).val();
 			_this.updateLink($(this).val());