diff --git a/bundles/specmate-hp-connector/src/com/specmate/connectors/hpconnector/internal/util/HPUtil.java b/bundles/specmate-hp-connector/src/com/specmate/connectors/hpconnector/internal/util/HPUtil.java
index e0e2064b4..312e9d251 100644
--- a/bundles/specmate-hp-connector/src/com/specmate/connectors/hpconnector/internal/util/HPUtil.java
+++ b/bundles/specmate-hp-connector/src/com/specmate/connectors/hpconnector/internal/util/HPUtil.java
@@ -49,8 +49,9 @@ private static String getPlatform(TestProcedure procedure) {
 		Requirement requirement = SpecmateEcoreUtil.getFirstAncestorOfType(procedure, Requirement.class);
 		if (requirement != null) {
 			return requirement.getPlatform();
-		} else
+		} else {
 			return null;
+		}
 	}
 
 	private static List<TestStep> getSteps(TestProcedure procedure) {
@@ -61,7 +62,7 @@ private static List<TestStep> getSteps(TestProcedure procedure) {
 
 	private static JSONObject getJSONForTestStep(TestStep step) {
 		JSONObject jsonForStep = new JSONObject();
-		jsonForStep.put("name", "Step " + (step.getPosition() + 1));
+		jsonForStep.put("name", step.getName());
 		jsonForStep.put("description", step.getDescription());
 		jsonForStep.put("expected", step.getExpectedOutcome());
 		return jsonForStep;
diff --git a/bundles/specmate-std-env/dev-specmate-all-oracle.bndrun b/bundles/specmate-std-env/dev-specmate-all-oracle.bndrun
index 45c368bfa..003a1f5f8 100644
--- a/bundles/specmate-std-env/dev-specmate-all-oracle.bndrun
+++ b/bundles/specmate-std-env/dev-specmate-all-oracle.bndrun
@@ -222,7 +222,8 @@
 	org.eclipse.xtext.util;version='[2.10.0,2.10.1)',\
 	org.eclipse.xtext.xbase.lib;version='[2.10.0,2.10.1)',\
 	specmate-cause-effect-patterns;version=snapshot,\
-	jaxb-api;version='[2.3.1,2.3.2)'
+	jaxb-api;version='[2.3.1,2.3.2)',\
+	specmate-xtext;version=snapshot
 
 -runproperties: \
 	jetty.http.port=8080,\
diff --git a/bundles/specmate-std-env/dev-specmate-all.bndrun b/bundles/specmate-std-env/dev-specmate-all.bndrun
index f9352b725..9c67c2c15 100644
--- a/bundles/specmate-std-env/dev-specmate-all.bndrun
+++ b/bundles/specmate-std-env/dev-specmate-all.bndrun
@@ -1,5 +1,4 @@
 -runfw: org.eclipse.osgi;version='[3.13.300.v20190218-1622,3.13.300.v20190218-1622]'
--runee: JavaSE-11
 -runrequires: \
 	osgi.identity;filter:='(osgi.identity=specmate-cdo-server)',\
 	osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)',\
diff --git a/bundles/specmate-std-env/dev-specmate-no-cdo-server.bndrun b/bundles/specmate-std-env/dev-specmate-no-cdo-server.bndrun
index 988d0aacd..5ec85aa50 100644
--- a/bundles/specmate-std-env/dev-specmate-no-cdo-server.bndrun
+++ b/bundles/specmate-std-env/dev-specmate-no-cdo-server.bndrun
@@ -203,7 +203,8 @@
 	org.eclipse.xtext.util;version='[2.10.0,2.10.1)',\
 	org.eclipse.xtext.xbase.lib;version='[2.10.0,2.10.1)',\
 	specmate-cause-effect-patterns;version=snapshot,\
-	jaxb-api;version='[2.3.1,2.3.2)'
+	jaxb-api;version='[2.3.1,2.3.2)',\
+	specmate-xtext;version=snapshot
 
 -runproperties: \
 	jetty.http.port=8080,\
diff --git a/bundles/specmate-std-env/prod-specmate-all.bndrun b/bundles/specmate-std-env/prod-specmate-all.bndrun
index 0abf983d5..f394490f4 100644
--- a/bundles/specmate-std-env/prod-specmate-all.bndrun
+++ b/bundles/specmate-std-env/prod-specmate-all.bndrun
@@ -213,7 +213,8 @@
 	org.eclipse.xtext.util;version='[2.10.0,2.10.1)',\
 	org.eclipse.xtext.xbase.lib;version='[2.10.0,2.10.1)',\
 	specmate-cause-effect-patterns;version=snapshot,\
-	jaxb-api;version='[2.3.1,2.3.2)'
+	jaxb-api;version='[2.3.1,2.3.2)',\
+	specmate-xtext;version=snapshot
 
 -runproperties: \
 	jetty.http.port=8080,\
diff --git a/bundles/specmate-std-env/prod-specmate-cdo-server-oracle.bndrun b/bundles/specmate-std-env/prod-specmate-cdo-server-oracle.bndrun
index cbb0213d5..e30e25f91 100644
--- a/bundles/specmate-std-env/prod-specmate-cdo-server-oracle.bndrun
+++ b/bundles/specmate-std-env/prod-specmate-cdo-server-oracle.bndrun
@@ -1,25 +1,24 @@
 -runfw: org.eclipse.osgi;version='[3.13.300.v20190218-1622,3.13.300.v20190218-1622]'
 -runee: JavaSE-11
 -runrequires: \
-	osgi.identity;filter:='(osgi.identity=org.eclipse.equinox.log)',\
-	osgi.identity;filter:='(osgi.identity=jul.to.slf4j)',\
-	osgi.identity;filter:='(osgi.identity=log4j.over.slf4j)',\
-	osgi.identity;filter:='(osgi.identity=specmate-common)',\
-	osgi.identity;filter:='(osgi.identity=specmate-logging)',\
-	osgi.identity;filter:='(osgi.identity=specmate-logging-slf4j)',\
-	osgi.identity;filter:='(osgi.identity=specmate-logging-slf4j-julbridge)',\
-	osgi.identity;filter:='(osgi.identity=org.eclipse.equinox.cm)',\
-	osgi.identity;filter:='(osgi.identity=org.eclipse.equinox.metatype)',\
-	osgi.identity;filter:='(osgi.identity=org.apache.felix.scr)',\
-	osgi.identity;filter:='(osgi.identity=specmate-cdo-server)',\
-	osgi.identity;filter:='(osgi.identity=org.eclipse.emf.cdo.server.ocl)',\
-	osgi.identity;filter:='(osgi.identity=specmate-migration)',\
-	osgi.identity;filter:='(osgi.identity=specmate-model-gen)',\
+	osgi.identity;filter:='(osgi.identity=org.eclipse.equinox.log)',\
+	osgi.identity;filter:='(osgi.identity=jul.to.slf4j)',\
+	osgi.identity;filter:='(osgi.identity=log4j.over.slf4j)',\
+	osgi.identity;filter:='(osgi.identity=specmate-common)',\
+	osgi.identity;filter:='(osgi.identity=specmate-logging)',\
+	osgi.identity;filter:='(osgi.identity=specmate-logging-slf4j)',\
+	osgi.identity;filter:='(osgi.identity=specmate-logging-slf4j-julbridge)',\
+	osgi.identity;filter:='(osgi.identity=org.eclipse.equinox.cm)',\
+	osgi.identity;filter:='(osgi.identity=org.eclipse.equinox.metatype)',\
+	osgi.identity;filter:='(osgi.identity=specmate-config)',\
+	osgi.identity;filter:='(osgi.identity=org.apache.felix.scr)',\
+	osgi.identity;filter:='(osgi.identity=specmate-cdo-server)',\
+	osgi.identity;filter:='(osgi.identity=org.eclipse.emf.cdo.server.ocl)',\
+	osgi.identity;filter:='(&(osgi.identity=org.h2)(version>=1.3.168))',\
+	osgi.identity;filter:='(osgi.identity=specmate-migration)',\
+	osgi.identity;filter:='(osgi.identity=specmate-model-gen)',\
+	osgi.identity;filter:='(osgi.identity=specmate-model-support)',\
 	osgi.identity;filter:='(osgi.identity=specmate-dbprovider-api)',\
-	osgi.identity;filter:='(osgi.identity=org.eclipse.net4j.db.jdbc)',\
-	osgi.identity;filter:='(osgi.identity=org.eclipse.net4j.db.oracle)',\
-	osgi.identity;filter:='(osgi.identity=specmate-model-support)',\
-	bnd.identity;version='latest';id='specmate-config',\
 	bnd.identity;version='latest';id='specmate-dbprovider-oracle'
 -runproperties: \
 	osgi.console=,\
@@ -83,5 +82,6 @@
 	com.google.guava;version='[21.0.0,21.0.1)',\
 	org.apache.commons.lang3;version='[3.5.0,3.5.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
-	org.eclipse.emf.cdo.ecore.retrofit;version='[4.2.300,4.2.301)'
+	org.eclipse.emf.cdo.ecore.retrofit;version='[4.2.300,4.2.301)',\
+	org.h2;version='[1.3.168,1.3.169)'
 -resolve: auto
\ No newline at end of file
diff --git a/bundles/specmate-std-env/prod-specmate-cdo-server.bndrun b/bundles/specmate-std-env/prod-specmate-cdo-server.bndrun
index 3d3c180be..fff6da9be 100644
--- a/bundles/specmate-std-env/prod-specmate-cdo-server.bndrun
+++ b/bundles/specmate-std-env/prod-specmate-cdo-server.bndrun
@@ -19,8 +19,7 @@
 	osgi.identity;filter:='(osgi.identity=specmate-model-gen)',\
 	osgi.identity;filter:='(osgi.identity=specmate-model-support)',\
 	osgi.identity;filter:='(osgi.identity=specmate-dbprovider-api)',\
-	osgi.identity;filter:='(osgi.identity=specmate-dbprovider-h2)',\
-	bnd.identity;id='specmate-dummy-data'
+	osgi.identity;filter:='(osgi.identity=specmate-dbprovider-h2)'
 -runbundles: \
 	jul.to.slf4j;version='[1.7.12,1.7.13)',\
 	log4j.over.slf4j;version='[1.7.12,1.7.13)',\
@@ -72,47 +71,8 @@
 	specmate-dbprovider-h2;version=snapshot,\
 	org.eclipse.emf.cdo.server.db;version='[4.4.0,4.4.1)',\
 	com.google.guava;version='[21.0.0,21.0.1)',\
-	javax.annotation-api;version='[1.2.0,1.2.1)',\
-	javax.validation.api;version='[1.1.0,1.1.1)',\
-	javax.ws.rs-api;version='[2.0.1,2.0.2)',\
 	org.apache.commons.lang3;version='[3.5.0,3.5.1)',\
-	org.apache.servicemix.bundles.jakarta-regexp;version='[1.4.0,1.4.1)',\
-	org.apache.servicemix.bundles.lucene;version='[7.2.0,7.2.1)',\
-	org.apache.servicemix.bundles.lucene-queries;version='[7.2.0,7.2.1)',\
-	org.apache.servicemix.bundles.lucene-queryparser;version='[7.2.0,7.2.1)',\
-	org.apache.servicemix.bundles.lucene-sandbox;version='[7.2.0,7.2.1)',\
-	org.glassfish.hk2.api;version='[2.4.0,2.4.1)',\
-	org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\
-	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\
-	org.glassfish.hk2.utils;version='[2.4.0,2.4.1)',\
-	org.glassfish.jersey.bundles.repackaged.jersey-guava;version='[2.17.0,2.17.1)',\
-	org.glassfish.jersey.core.jersey-client;version='[2.17.0,2.17.1)',\
-	org.glassfish.jersey.core.jersey-common;version='[2.17.0,2.17.1)',\
-	org.glassfish.jersey.core.jersey-server;version='[2.17.0,2.17.1)',\
-	org.glassfish.jersey.media.jersey-media-sse;version='[2.17.0,2.17.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
-	specmate-auth-api;version=snapshot,\
-	specmate-connectors;version=snapshot,\
-	specmate-dummy-data;version=snapshot,\
-	specmate-emfrest-api;version=snapshot,\
-	specmate-rest;version=snapshot,\
-	specmate-scheduler;version=snapshot,\
-	specmate-search;version=snapshot,\
-	com.diffplug.osgi.extension.sun.misc;version='[0.0.0,0.0.1)',\
-	com.sun.activation.javax.activation;version='[1.2.0,1.2.1)',\
-	io.prometheus.simpleclient;version='[0.4.0,0.4.1)',\
-	io.prometheus.simpleclient_common;version='[0.4.0,0.4.1)',\
-	io.prometheus.simpleclient_hotspot;version='[0.4.0,0.4.1)',\
-	io.prometheus.simpleclient_servlet;version='[0.4.0,0.4.1)',\
-	org.apache.felix.webconsole;version='[4.2.8,4.2.9)',\
-	org.eclipse.emf.cdo.net4j;version='[4.1.400,4.1.401)',\
-	org.eclipse.jetty.osgi-servlet-api;version='[3.1.0,3.1.1)',\
-	specmate-administration;version=snapshot,\
-	specmate-metrics;version=snapshot,\
-	specmate-persistency-cdo;version=snapshot,\
-	javax.activation-api;version='[1.2.0,1.2.1)',\
-	jaxb-api;version='[2.3.1,2.3.2)',\
 	org.eclipse.emf.cdo.ecore.retrofit;version='[4.2.300,4.2.301)'
 
 -runproperties: \
diff --git a/bundles/specmate-std-env/prod-specmate-no-cdo-server.bndrun b/bundles/specmate-std-env/prod-specmate-no-cdo-server.bndrun
index 58a435568..feef4ecf9 100644
--- a/bundles/specmate-std-env/prod-specmate-no-cdo-server.bndrun
+++ b/bundles/specmate-std-env/prod-specmate-no-cdo-server.bndrun
@@ -203,7 +203,8 @@
 	org.eclipse.xtext.util;version='[2.10.0,2.10.1)',\
 	org.eclipse.xtext.xbase.lib;version='[2.10.0,2.10.1)',\
 	specmate-cause-effect-patterns;version=snapshot,\
-	jaxb-api;version='[2.3.1,2.3.2)'
+	jaxb-api;version='[2.3.1,2.3.2)',\
+	specmate-xtext;version=snapshot
 
 -runproperties: \
 	jetty.http.port=8080,\