diff --git a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
index 8b5a37ff1..5da1c60a7 100644
--- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
@@ -1,7 +1,7 @@
 -include: ../itest-common.bndrun
 
 Bundle-SymbolicName: ${project.artifactId}
-Fragment-Host: org.openhab.core.automation.module.core
+Fragment-Host: org.openhab.core.automation
 
 -runrequires: bnd.identity;id='org.openhab.core.automation.module.core.tests'
 
@@ -9,87 +9,41 @@ Fragment-Host: org.openhab.core.automation.module.core
 # done
 #
 -runbundles: \
-	ch.qos.logback.classic;version='[1.2.0,1.2.1)',\
-	ch.qos.logback.core;version='[1.2.0,1.2.1)',\
-	com.google.gson;version='[2.7.0,2.7.1)',\
-	com.google.guava;version='[15.0.0,15.0.1)',\
-	com.google.inject;version='[3.0.0,3.0.1)',\
+	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
+	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
+	com.google.gson;version='[2.8.2,2.8.3)',\
 	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-	joda-time;version='[2.9.2,2.9.3)',\
-	log4j;version='[1.2.17,1.2.18)',\
-	org.antlr.runtime;version='[3.2.0,3.2.1)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.9.7,1.9.8)',\
+	net.bytebuddy.byte-buddy;version='[1.9.7,1.9.8)',\
 	org.apache.commons.collections;version='[3.2.1,3.2.2)',\
-	org.apache.commons.exec;version='[1.1.0,1.1.1)',\
 	org.apache.commons.io;version='[2.2.0,2.2.1)',\
 	org.apache.commons.lang;version='[2.6.0,2.6.1)',\
-	org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
 	org.apache.felix.scr;version='[2.1.10,2.1.11)',\
-	org.apache.servicemix.bundles.commons-codec;version='[1.3.0,1.3.1)',\
-	org.apache.servicemix.bundles.commons-httpclient;version='[3.1.0,3.1.1)',\
-	org.apache.xbean.bundleutils;version='[4.6.0,4.6.1)',\
-	org.apache.xbean.finder;version='[4.6.0,4.6.1)',\
-	org.eclipse.emf.common;version='[2.12.0,2.12.1)',\
-	org.eclipse.emf.ecore;version='[2.12.0,2.12.1)',\
-	org.eclipse.emf.ecore.xmi;version='[2.12.0,2.12.1)',\
-	org.eclipse.equinox.common;version='[3.8.0,3.8.1)',\
+	org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
+	org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
+	org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
+	org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
 	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
-	org.eclipse.jetty.client;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.http;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.io;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.proxy;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.security;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.server;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.servlet;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.util;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.websocket.api;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
-	org.eclipse.xtend.lib;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.common.types;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.util;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.xbase;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.14.0,2.14.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.objectweb.asm;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.commons;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.tree;version='[6.1.1,6.1.2)',\
-	org.openhab.core.compat1x;version='[2.5.0,2.5.1)',\
-	org.ops4j.pax.swissbox.optional.jcl;version='[1.8.2,1.8.3)',\
-	org.ops4j.pax.web.pax-web-api;version='[7.2.3,7.2.4)',\
-	org.ops4j.pax.web.pax-web-jetty;version='[7.2.3,7.2.4)',\
-	org.ops4j.pax.web.pax-web-runtime;version='[7.2.3,7.2.4)',\
-	org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\
-	org.osgi.service.event;version='[1.4.0,1.4.1)',\
-	slf4j.api;version='[1.7.21,1.7.22)',\
-	tec.uom.lib.uom-lib-common;version='[1.0.2,1.0.3)',\
-	tec.uom.se;version='[1.0.8,1.0.9)',\
-	osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
-	osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
-	org.openhab.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.audio;version='[2.5.0,2.5.1)',\
-	org.openhab.core.compat1x.tests;version='[2.5.0,2.5.1)',\
+	org.mockito.mockito-core;version='[2.25.0,2.25.1)',\
+	org.objenesis;version='[2.6.0,2.6.1)',\
+	org.openhab.core.automation.module.core.tests;version='[2.5.0,2.5.1)',\
+	org.openhab.core.automation;version='[2.5.0,2.5.1)',\
 	org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
 	org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.http;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.net;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.item;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.persistence;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.script;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\
-	org.openhab.core.persistence;version='[2.5.0,2.5.1)',\
-	org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\
+	org.openhab.core.storage.json;version='[2.5.0,2.5.1)',\
+	org.openhab.core.test;version='[2.5.0,2.5.1)',\
 	org.openhab.core.thing;version='[2.5.0,2.5.1)',\
-	org.openhab.core.transform;version='[2.5.0,2.5.1)',\
-	org.openhab.core.ui;version='[2.5.0,2.5.1)',\
-	org.openhab.core.voice;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\
-	org.openhab.core.storage.json;version='[2.5.0,2.5.1)'
+	org.openhab.core;version='[2.5.0,2.5.1)',\
+	org.osgi.service.event;version='[1.4.0,1.4.1)',\
+	osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
+	osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
+	slf4j.api;version='[1.7.25,1.7.26)',\
+	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
+	tec.uom.se;version='[1.0.10,1.0.11)'
diff --git a/itests/org.openhab.core.automation.module.script.defaultscope.tests/itest.bndrun b/itests/org.openhab.core.automation.module.script.defaultscope.tests/itest.bndrun
index 82776c672..1205eae56 100644
--- a/itests/org.openhab.core.automation.module.script.defaultscope.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.script.defaultscope.tests/itest.bndrun
@@ -1,95 +1,45 @@
 -include: ../itest-common.bndrun
 
 Bundle-SymbolicName: ${project.artifactId}
-Fragment-Host: org.openhab.core.automation.module.script.defaultscope
 
--runrequires: bnd.identity;id='org.openhab.core.module.script.defaultscope.tests'
+-runrequires: bnd.identity;id='org.openhab.core.automation.module.script.defaultscope.tests'
 
 #
 # done
 #
 -runbundles: \
-	ch.qos.logback.classic;version='[1.2.0,1.2.1)',\
-	ch.qos.logback.core;version='[1.2.0,1.2.1)',\
-	com.google.gson;version='[2.7.0,2.7.1)',\
-	com.google.guava;version='[15.0.0,15.0.1)',\
-	com.google.inject;version='[3.0.0,3.0.1)',\
+	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
+	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
+	com.google.gson;version='[2.8.2,2.8.3)',\
 	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-	joda-time;version='[2.9.2,2.9.3)',\
-	log4j;version='[1.2.17,1.2.18)',\
-	org.antlr.runtime;version='[3.2.0,3.2.1)',\
 	org.apache.commons.collections;version='[3.2.1,3.2.2)',\
-	org.apache.commons.exec;version='[1.1.0,1.1.1)',\
 	org.apache.commons.io;version='[2.2.0,2.2.1)',\
 	org.apache.commons.lang;version='[2.6.0,2.6.1)',\
-	org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
 	org.apache.felix.scr;version='[2.1.10,2.1.11)',\
-	org.apache.servicemix.bundles.commons-codec;version='[1.3.0,1.3.1)',\
-	org.apache.servicemix.bundles.commons-httpclient;version='[3.1.0,3.1.1)',\
-	org.apache.xbean.bundleutils;version='[4.6.0,4.6.1)',\
-	org.apache.xbean.finder;version='[4.6.0,4.6.1)',\
-	org.eclipse.emf.common;version='[2.12.0,2.12.1)',\
-	org.eclipse.emf.ecore;version='[2.12.0,2.12.1)',\
-	org.eclipse.emf.ecore.xmi;version='[2.12.0,2.12.1)',\
-	org.eclipse.equinox.common;version='[3.8.0,3.8.1)',\
+	org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
+	org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
+	org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
+	org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
 	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
-	org.eclipse.jetty.client;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.http;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.io;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.proxy;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.security;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.server;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.servlet;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.util;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.websocket.api;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
-	org.eclipse.xtend.lib;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.common.types;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.util;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.xbase;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.14.0,2.14.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.objectweb.asm;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.commons;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.tree;version='[6.1.1,6.1.2)',\
-	org.openhab.core.compat1x;version='[2.5.0,2.5.1)',\
-	org.ops4j.pax.swissbox.optional.jcl;version='[1.8.2,1.8.3)',\
-	org.ops4j.pax.web.pax-web-api;version='[7.2.3,7.2.4)',\
-	org.ops4j.pax.web.pax-web-jetty;version='[7.2.3,7.2.4)',\
-	org.ops4j.pax.web.pax-web-runtime;version='[7.2.3,7.2.4)',\
-	org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\
-	org.osgi.service.event;version='[1.4.0,1.4.1)',\
-	slf4j.api;version='[1.7.21,1.7.22)',\
-	tec.uom.lib.uom-lib-common;version='[1.0.2,1.0.3)',\
-	tec.uom.se;version='[1.0.8,1.0.9)',\
-	osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
-	osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
-	org.openhab.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.audio;version='[2.5.0,2.5.1)',\
-	org.openhab.core.compat1x.tests;version='[2.5.0,2.5.1)',\
+	org.openhab.core.automation.module.script.defaultscope.tests;version='[2.5.0,2.5.1)',\
+	org.openhab.core.automation.module.script;version='[2.5.0,2.5.1)',\
+	org.openhab.core.automation;version='[2.5.0,2.5.1)',\
 	org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
 	org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.http;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.net;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.item;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.persistence;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.script;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\
-	org.openhab.core.persistence;version='[2.5.0,2.5.1)',\
-	org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\
+	org.openhab.core.storage.json;version='[2.5.0,2.5.1)',\
+	org.openhab.core.test;version='[2.5.0,2.5.1)',\
 	org.openhab.core.thing;version='[2.5.0,2.5.1)',\
-	org.openhab.core.transform;version='[2.5.0,2.5.1)',\
-	org.openhab.core.ui;version='[2.5.0,2.5.1)',\
-	org.openhab.core.voice;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\
-	org.openhab.core.storage.json;version='[2.5.0,2.5.1)'
+	org.openhab.core;version='[2.5.0,2.5.1)',\
+	org.osgi.service.event;version='[1.4.0,1.4.1)',\
+	osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
+	osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
+	slf4j.api;version='[1.7.25,1.7.26)',\
+	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
+	tec.uom.se;version='[1.0.10,1.0.11)'
\ No newline at end of file
diff --git a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
index 449ae3d61..3fe1ee381 100644
--- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
@@ -9,87 +9,38 @@ Fragment-Host: org.openhab.core.automation.module.script
 # done
 #
 -runbundles: \
-	ch.qos.logback.classic;version='[1.2.0,1.2.1)',\
-	ch.qos.logback.core;version='[1.2.0,1.2.1)',\
-	com.google.gson;version='[2.7.0,2.7.1)',\
-	com.google.guava;version='[15.0.0,15.0.1)',\
-	com.google.inject;version='[3.0.0,3.0.1)',\
+	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
+	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
+	com.google.gson;version='[2.8.2,2.8.3)',\
 	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-	joda-time;version='[2.9.2,2.9.3)',\
-	log4j;version='[1.2.17,1.2.18)',\
-	org.antlr.runtime;version='[3.2.0,3.2.1)',\
 	org.apache.commons.collections;version='[3.2.1,3.2.2)',\
-	org.apache.commons.exec;version='[1.1.0,1.1.1)',\
 	org.apache.commons.io;version='[2.2.0,2.2.1)',\
 	org.apache.commons.lang;version='[2.6.0,2.6.1)',\
-	org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
 	org.apache.felix.scr;version='[2.1.10,2.1.11)',\
-	org.apache.servicemix.bundles.commons-codec;version='[1.3.0,1.3.1)',\
-	org.apache.servicemix.bundles.commons-httpclient;version='[3.1.0,3.1.1)',\
-	org.apache.xbean.bundleutils;version='[4.6.0,4.6.1)',\
-	org.apache.xbean.finder;version='[4.6.0,4.6.1)',\
-	org.eclipse.emf.common;version='[2.12.0,2.12.1)',\
-	org.eclipse.emf.ecore;version='[2.12.0,2.12.1)',\
-	org.eclipse.emf.ecore.xmi;version='[2.12.0,2.12.1)',\
-	org.eclipse.equinox.common;version='[3.8.0,3.8.1)',\
+	org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
+	org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
+	org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
+	org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
 	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
-	org.eclipse.jetty.client;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.http;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.io;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.proxy;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.security;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.server;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.servlet;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.util;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.websocket.api;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
-	org.eclipse.xtend.lib;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.common.types;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.util;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.xbase;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.14.0,2.14.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.objectweb.asm;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.commons;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.tree;version='[6.1.1,6.1.2)',\
-	org.openhab.core.compat1x;version='[2.5.0,2.5.1)',\
-	org.ops4j.pax.swissbox.optional.jcl;version='[1.8.2,1.8.3)',\
-	org.ops4j.pax.web.pax-web-api;version='[7.2.3,7.2.4)',\
-	org.ops4j.pax.web.pax-web-jetty;version='[7.2.3,7.2.4)',\
-	org.ops4j.pax.web.pax-web-runtime;version='[7.2.3,7.2.4)',\
-	org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\
-	org.osgi.service.event;version='[1.4.0,1.4.1)',\
-	slf4j.api;version='[1.7.21,1.7.22)',\
-	tec.uom.lib.uom-lib-common;version='[1.0.2,1.0.3)',\
-	tec.uom.se;version='[1.0.8,1.0.9)',\
-	osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
-	osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
-	org.openhab.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.audio;version='[2.5.0,2.5.1)',\
-	org.openhab.core.compat1x.tests;version='[2.5.0,2.5.1)',\
+	org.openhab.core.automation.module.script.tests;version='[2.5.0,2.5.1)',\
+	org.openhab.core.automation.module.script;version='[2.5.0,2.5.1)',\
+	org.openhab.core.automation;version='[2.5.0,2.5.1)',\
 	org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
 	org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.http;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.net;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.item;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.persistence;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.script;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\
-	org.openhab.core.persistence;version='[2.5.0,2.5.1)',\
-	org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\
+	org.openhab.core.storage.json;version='[2.5.0,2.5.1)',\
+	org.openhab.core.test;version='[2.5.0,2.5.1)',\
 	org.openhab.core.thing;version='[2.5.0,2.5.1)',\
-	org.openhab.core.transform;version='[2.5.0,2.5.1)',\
-	org.openhab.core.ui;version='[2.5.0,2.5.1)',\
-	org.openhab.core.voice;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\
-	org.openhab.core.storage.json;version='[2.5.0,2.5.1)'
+	org.openhab.core;version='[2.5.0,2.5.1)',\
+	org.osgi.service.event;version='[1.4.0,1.4.1)',\
+	osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
+	osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
+	slf4j.api;version='[1.7.25,1.7.26)',\
+	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
+	tec.uom.se;version='[1.0.10,1.0.11)'
\ No newline at end of file
diff --git a/itests/org.openhab.core.automation.module.script.tests/src/main/java/org/openhab/core/automation/module/script/ScriptRuleTest.java b/itests/org.openhab.core.automation.module.script.tests/src/main/java/org/openhab/core/automation/module/script/ScriptRuleTest.java
index 9a2860c1a..9a317dc90 100644
--- a/itests/org.openhab.core.automation.module.script.tests/src/main/java/org/openhab/core/automation/module/script/ScriptRuleTest.java
+++ b/itests/org.openhab.core.automation.module.script.tests/src/main/java/org/openhab/core/automation/module/script/ScriptRuleTest.java
@@ -21,7 +21,7 @@ import java.util.Collections;
 import java.util.Optional;
 import java.util.Set;
 
-import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
 import org.eclipse.smarthome.core.events.Event;
 import org.eclipse.smarthome.core.events.EventFilter;
@@ -56,30 +56,32 @@ import org.slf4j.LoggerFactory;
  * @author Kai Kreuzer - Initial contribution
  *
  */
+
 public class ScriptRuleTest extends JavaOSGiTest {
 
-    final Logger logger = LoggerFactory.getLogger(ScriptRuleTest.class);
-    VolatileStorageService volatileStorageService = new VolatileStorageService();
+    private final Logger logger = LoggerFactory.getLogger(ScriptRuleTest.class);
+    private VolatileStorageService volatileStorageService = new VolatileStorageService();
 
-    ItemCommandEvent receivedEvent;
+    private ItemCommandEvent receivedEvent;
 
     public ScriptRuleTest() {
     }
 
     @Before
     public void before() {
+        @NonNullByDefault
         ItemProvider itemProvider = new ItemProvider() {
             @Override
-            public void addProviderChangeListener(@NonNull ProviderChangeListener<@NonNull Item> listener) {
+            public void addProviderChangeListener(ProviderChangeListener<Item> listener) {
             }
 
             @Override
-            public @NonNull Collection<@NonNull Item> getAll() {
+            public Collection<Item> getAll() {
                 return Arrays.asList(new Item[] { new SwitchItem("MyTrigger"), new SwitchItem("ScriptItem") });
             }
 
             @Override
-            public void removeProviderChangeListener(@NonNull ProviderChangeListener<@NonNull Item> listener) {
+            public void removeProviderChangeListener(ProviderChangeListener<Item> listener) {
             }
         };
         registerService(itemProvider);
diff --git a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
index d99f6492d..79207f2fb 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
@@ -1,7 +1,7 @@
 -include: ../itest-common.bndrun
 
 Bundle-SymbolicName: ${project.artifactId}
-Fragment-Host: org.openhab.core.automation.module.timer
+Fragment-Host: org.openhab.core.automation
 
 -runrequires: bnd.identity;id='org.openhab.core.automation.module.timer.tests'
 
@@ -9,87 +9,37 @@ Fragment-Host: org.openhab.core.automation.module.timer
 # done
 #
 -runbundles: \
-	ch.qos.logback.classic;version='[1.2.0,1.2.1)',\
-	ch.qos.logback.core;version='[1.2.0,1.2.1)',\
-	com.google.gson;version='[2.7.0,2.7.1)',\
-	com.google.guava;version='[15.0.0,15.0.1)',\
-	com.google.inject;version='[3.0.0,3.0.1)',\
 	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-	joda-time;version='[2.9.2,2.9.3)',\
-	log4j;version='[1.2.17,1.2.18)',\
-	org.antlr.runtime;version='[3.2.0,3.2.1)',\
 	org.apache.commons.collections;version='[3.2.1,3.2.2)',\
-	org.apache.commons.exec;version='[1.1.0,1.1.1)',\
 	org.apache.commons.io;version='[2.2.0,2.2.1)',\
 	org.apache.commons.lang;version='[2.6.0,2.6.1)',\
-	org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
 	org.apache.felix.scr;version='[2.1.10,2.1.11)',\
-	org.apache.servicemix.bundles.commons-codec;version='[1.3.0,1.3.1)',\
-	org.apache.servicemix.bundles.commons-httpclient;version='[3.1.0,3.1.1)',\
-	org.apache.xbean.bundleutils;version='[4.6.0,4.6.1)',\
-	org.apache.xbean.finder;version='[4.6.0,4.6.1)',\
-	org.eclipse.emf.common;version='[2.12.0,2.12.1)',\
-	org.eclipse.emf.ecore;version='[2.12.0,2.12.1)',\
-	org.eclipse.emf.ecore.xmi;version='[2.12.0,2.12.1)',\
-	org.eclipse.equinox.common;version='[3.8.0,3.8.1)',\
 	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
-	org.eclipse.jetty.client;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.http;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.io;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.proxy;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.security;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.server;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.servlet;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.util;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.websocket.api;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
-	org.eclipse.xtend.lib;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.common.types;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.util;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.xbase;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.14.0,2.14.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.objectweb.asm;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.commons;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.tree;version='[6.1.1,6.1.2)',\
-	org.openhab.core.compat1x;version='[2.5.0,2.5.1)',\
-	org.ops4j.pax.swissbox.optional.jcl;version='[1.8.2,1.8.3)',\
-	org.ops4j.pax.web.pax-web-api;version='[7.2.3,7.2.4)',\
-	org.ops4j.pax.web.pax-web-jetty;version='[7.2.3,7.2.4)',\
-	org.ops4j.pax.web.pax-web-runtime;version='[7.2.3,7.2.4)',\
-	org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\
 	org.osgi.service.event;version='[1.4.0,1.4.1)',\
-	slf4j.api;version='[1.7.21,1.7.22)',\
-	tec.uom.lib.uom-lib-common;version='[1.0.2,1.0.3)',\
-	tec.uom.se;version='[1.0.8,1.0.9)',\
 	osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
 	osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
 	org.openhab.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.audio;version='[2.5.0,2.5.1)',\
-	org.openhab.core.compat1x.tests;version='[2.5.0,2.5.1)',\
 	org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
 	org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.http;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.net;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.item;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.persistence;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.script;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\
-	org.openhab.core.persistence;version='[2.5.0,2.5.1)',\
-	org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\
 	org.openhab.core.thing;version='[2.5.0,2.5.1)',\
-	org.openhab.core.transform;version='[2.5.0,2.5.1)',\
-	org.openhab.core.ui;version='[2.5.0,2.5.1)',\
-	org.openhab.core.voice;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\
-	org.openhab.core.storage.json;version='[2.5.0,2.5.1)'
+	org.openhab.core.storage.json;version='[2.5.0,2.5.1)',\
+	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
+	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
+	com.google.gson;version='[2.8.2,2.8.3)',\
+	org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
+	org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
+	org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
+	org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
+	org.openhab.core.automation;version='[2.5.0,2.5.1)',\
+	org.openhab.core.automation.module.timer.tests;version='[2.5.0,2.5.1)',\
+	org.openhab.core.test;version='[2.5.0,2.5.1)',\
+	slf4j.api;version='[1.7.25,1.7.26)',\
+	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
+	tec.uom.se;version='[1.0.10,1.0.11)'
diff --git a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/BasicConditionHandlerTest.java b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/BasicConditionHandlerTest.java
index 94508b768..f0d417adf 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/BasicConditionHandlerTest.java
+++ b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/BasicConditionHandlerTest.java
@@ -24,7 +24,7 @@ import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 
-import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.smarthome.config.core.Configuration;
 import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
 import org.eclipse.smarthome.core.events.Event;
@@ -66,11 +66,11 @@ import org.slf4j.LoggerFactory;
  *
  */
 public abstract class BasicConditionHandlerTest extends JavaOSGiTest {
-    final Logger logger = LoggerFactory.getLogger(TimeOfDayConditionHandlerTest.class);
-    VolatileStorageService volatileStorageService = new VolatileStorageService();
-    RuleRegistry ruleRegistry;
-    RuleManager ruleEngine;
-    Event itemEvent = null;
+    private final Logger logger = LoggerFactory.getLogger(BasicConditionHandlerTest.class);
+    private VolatileStorageService volatileStorageService = new VolatileStorageService();
+    private RuleRegistry ruleRegistry;
+    private RuleManager ruleEngine;
+    private Event itemEvent = null;
 
     /**
      * This executes before every test and before the
@@ -79,13 +79,14 @@ public abstract class BasicConditionHandlerTest extends JavaOSGiTest {
      */
     @Before
     public void beforeBase() {
+        @NonNullByDefault
         ItemProvider itemProvider = new ItemProvider() {
             @Override
-            public void addProviderChangeListener(@NonNull ProviderChangeListener<@NonNull Item> listener) {
+            public void addProviderChangeListener(ProviderChangeListener<Item> listener) {
             }
 
             @Override
-            public @NonNull Collection<@NonNull Item> getAll() {
+            public Collection<Item> getAll() {
                 List<Item> items = new ArrayList<>();
                 items.add(new SwitchItem("TriggeredItem"));
                 items.add(new SwitchItem("SwitchedItem"));
@@ -93,7 +94,7 @@ public abstract class BasicConditionHandlerTest extends JavaOSGiTest {
             }
 
             @Override
-            public void removeProviderChangeListener(@NonNull ProviderChangeListener<@NonNull Item> listener) {
+            public void removeProviderChangeListener(ProviderChangeListener<Item> listener) {
             }
 
         };
diff --git a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/DayOfWeekConditionHandlerTest.java b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/DayOfWeekConditionHandlerTest.java
index 50715aa92..96f9ced04 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/DayOfWeekConditionHandlerTest.java
+++ b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/DayOfWeekConditionHandlerTest.java
@@ -27,6 +27,8 @@ import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.internal.module.handler.DayOfWeekConditionHandler;
 import org.openhab.core.automation.type.ModuleTypeRegistry;
 import org.openhab.core.automation.util.ModuleBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This tests the dayOfWeek Condition.
@@ -36,9 +38,11 @@ import org.openhab.core.automation.util.ModuleBuilder;
  *
  */
 public class DayOfWeekConditionHandlerTest extends BasicConditionHandlerTest {
-    Calendar cal = Calendar.getInstance();
-    SimpleDateFormat sdf = new SimpleDateFormat("EEE", Locale.ENGLISH);
-    String dayOfWeek = sdf.format(cal.getTime()).toUpperCase();
+
+    private final Logger logger = LoggerFactory.getLogger(DayOfWeekConditionHandlerTest.class);
+    private Calendar cal = Calendar.getInstance();
+    private SimpleDateFormat sdf = new SimpleDateFormat("EEE", Locale.ENGLISH);
+    private String dayOfWeek = sdf.format(cal.getTime()).toUpperCase();
 
     public DayOfWeekConditionHandlerTest() {
         logger.info("Today is {}", dayOfWeek);
diff --git a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/RuntimeRuleTest.java b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/RuntimeRuleTest.java
index 2cd0aefa8..3e57cd305 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/RuntimeRuleTest.java
+++ b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/RuntimeRuleTest.java
@@ -23,7 +23,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
-import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.smarthome.config.core.Configuration;
 import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
 import org.eclipse.smarthome.core.events.Event;
@@ -62,10 +62,10 @@ import org.slf4j.LoggerFactory;
  */
 public class RuntimeRuleTest extends JavaOSGiTest {
 
-    final Logger logger = LoggerFactory.getLogger(RuntimeRuleTest.class);
-    VolatileStorageService volatileStorageService = new VolatileStorageService();
-    RuleRegistry ruleRegistry;
-    RuleManager ruleEngine;
+    private final Logger logger = LoggerFactory.getLogger(RuntimeRuleTest.class);
+    private VolatileStorageService volatileStorageService = new VolatileStorageService();
+    private RuleRegistry ruleRegistry;
+    private RuleManager ruleEngine;
 
     public RuntimeRuleTest() {
     }
@@ -206,6 +206,7 @@ public class RuntimeRuleTest extends JavaOSGiTest {
         });
     }
 
+    @NonNullByDefault
     class TestItemProvider implements ItemProvider {
         private final Collection<Item> items;
 
@@ -219,11 +220,11 @@ public class RuntimeRuleTest extends JavaOSGiTest {
         }
 
         @Override
-        public void addProviderChangeListener(@NonNull ProviderChangeListener<@NonNull Item> listener) {
+        public void addProviderChangeListener(ProviderChangeListener<Item> listener) {
         }
 
         @Override
-        public void removeProviderChangeListener(@NonNull ProviderChangeListener<@NonNull Item> listener) {
+        public void removeProviderChangeListener(ProviderChangeListener<Item> listener) {
         }
     }
 
diff --git a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/TimeOfDayTriggerHandlerTest.java b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/TimeOfDayTriggerHandlerTest.java
index e61aabc20..213364334 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/TimeOfDayTriggerHandlerTest.java
+++ b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/TimeOfDayTriggerHandlerTest.java
@@ -22,8 +22,6 @@ import org.junit.Test;
 import org.openhab.core.automation.RuleRegistry;
 import org.openhab.core.automation.internal.module.handler.TimeOfDayTriggerHandler;
 import org.openhab.core.automation.type.ModuleTypeRegistry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * this tests the timeOfDay trigger
@@ -33,9 +31,8 @@ import org.slf4j.LoggerFactory;
  */
 public class TimeOfDayTriggerHandlerTest extends JavaOSGiTest {
 
-    final Logger logger = LoggerFactory.getLogger(RuntimeRuleTest.class);
-    VolatileStorageService volatileStorageService = new VolatileStorageService();
-    RuleRegistry ruleRegistry;
+    private VolatileStorageService volatileStorageService = new VolatileStorageService();
+    private RuleRegistry ruleRegistry;
 
     public TimeOfDayTriggerHandlerTest() {
     }
diff --git a/itests/pom.xml b/itests/pom.xml
index 1b47225bd..50153f8dc 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -20,10 +20,10 @@
     <module>org.openhab.core.audio.tests</module>
     <module>org.openhab.core.auth.oauth2client.tests</module>
     <module>org.openhab.core.automation.tests</module>
-    <!-- <module>org.openhab.core.automation.module.core.tests</module> -->
-    <!-- <module>org.openhab.core.automation.module.timer.tests</module> -->
-    <!-- <module>org.openhab.core.automation.module.script.defaultscope.tests</module> -->
-    <!-- <module>org.openhab.core.automation.module.script.tests</module> -->
+    <module>org.openhab.core.automation.module.core.tests</module>
+    <module>org.openhab.core.automation.module.timer.tests</module>
+    <module>org.openhab.core.automation.module.script.defaultscope.tests</module>
+    <module>org.openhab.core.automation.module.script.tests</module>
     <!-- <module>org.openhab.core.automation.integration.tests</module> -->
     <module>org.openhab.core.binding.xml.tests</module>
     <module>org.openhab.core.compat1x.tests</module>