diff --git a/.travis.yml b/.travis.yml
index 69b581da..c97c5afd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,22 +2,19 @@ os:
   - linux
   - osx
   - windows
-
 language: node_js
 node_js:
   - '6'
   - '8'
   - '10'
-
 env:
-  - CXX=g++-4.8
+  - CXX=g++-4.9
 addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
     packages:
       - g++-4.9
-
 before_install:
   - 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then CC=gcc-4.9; fi'
   - 'if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then CC=g++-4.9; fi'
@@ -25,8 +22,8 @@ before_script:
   - export NPMVERSION=$(echo "$($(which npm) -v)"|cut -c1)
   - 'if [[ $NPMVERSION == 5 ]]; then npm install -g npm; fi'
   - npm -v
-  - npm install winston@2.3.1
+  - npm install winston@3.2.1
   - 'npm install https://github.com/ioBroker/ioBroker.js-controller/tarball/master --production'
 script:
-  - npm run test:package
-  - npm run test:iobroker
\ No newline at end of file
+  - 'npm run test:package'
+  - 'npm run test:iobroker'
diff --git a/README.md b/README.md
index 5d2e59da..2271b5c9 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,9 @@
 ![alt text](https://raw.githubusercontent.com/DutchmanNL/ioBroker.opentherm/master/admin/opentherm_large.png)
 
 # Opentherm integration ioBroker
-
+![alt text](https://travis-ci.org/iobroker-community-adapters/ioBroker.opentherm.svg?branch=master)
+![Number of Installations](http://iobroker.live/badges/opentherm-installed.svg) ![Number of Installations](http://iobroker.live/badges/opentherm-stable.svg) [![NPM version](http://img.shields.io/npm/v/iobroker.opentherm.svg)](https://www.npmjs.com/package/iobroker.opentherm)
+[![Downloads](https://img.shields.io/npm/dm/iobroker.opentherm.svg)](https://www.npmjs.com/package/iobroker.opentherm)
 [![Greenkeeper badge](https://badges.greenkeeper.io/iobroker-community-adapters/ioBroker.opentherm.svg)](https://greenkeeper.io/)
 
 This adapter integrates all features of the opentherm gateway into ioBroker.
diff --git a/package.json b/package.json
index 4107bb6f..21d706b7 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@iobroker/adapter-core": "^1.0.1",
+    "@iobroker/adapter-core": "^1.0.3",
     "@types/request": "^2.48.1",
     "gulp": "^4.0.0",
     "axios": "^0.18.0",
@@ -49,7 +49,7 @@
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "eslint": "^5.9.0",
-    "mocha": "^6.0.0",
+    "mocha": "^6.0.2",
     "proxyquire": "^2.1.0",
     "sinon": "^7.1.1",
     "sinon-chai": "^3.3.0"
@@ -77,4 +77,4 @@
     "test:package": "mocha test/testPackageFiles.js --exit"
   },
   "version": "0.1.9"
-}
+}
\ No newline at end of file
diff --git a/test/lib/setup.js b/test/lib/setup.js
index 92eaf453..28e5e8b9 100644
--- a/test/lib/setup.js
+++ b/test/lib/setup.js
@@ -14,8 +14,8 @@ adapterName = adapterName[adapterName.length - 2];
 var adapterStarted = false;
 
 function getAppName() {
-	var parts = __dirname.replace(/\\/g, '/').split('/');
-	return parts[parts.length - 3].split('.')[0];
+    var parts = __dirname.replace(/\\/g, '/').split('/');
+    return parts[parts.length - 3].split('.')[0];
 }
 
 var appName = getAppName().toLowerCase();
@@ -27,702 +27,703 @@ var pid = null;
 
 function copyFileSync(source, target) {
 
-	var targetFile = target;
-
-	//if target is a directory a new file with the same name will be created
-	if (fs.existsSync(target)) {
-		if ( fs.lstatSync( target ).isDirectory() ) {
-			targetFile = path.join(target, path.basename(source));
-		}
-	}
-
-	try {
-		fs.writeFileSync(targetFile, fs.readFileSync(source));
-	}
-	catch (err) {
-		console.log("file copy error: " +source +" -> " + targetFile + " (error ignored)");
-	}
+    var targetFile = target;
+
+    //if target is a directory a new file with the same name will be created
+    if (fs.existsSync(target)) {
+        if ( fs.lstatSync( target ).isDirectory() ) {
+            targetFile = path.join(target, path.basename(source));
+        }
+    }
+
+    try {
+        fs.writeFileSync(targetFile, fs.readFileSync(source));
+    }
+    catch (err) {
+        console.log("file copy error: " +source +" -> " + targetFile + " (error ignored)");
+    }
 }
 
 function copyFolderRecursiveSync(source, target, ignore) {
-	var files = [];
-
-	var base = path.basename(source);
-	if (base === adapterName) {
-		base = pkg.name;
-	}
-	//check if folder needs to be created or integrated
-	var targetFolder = path.join(target, base);
-	if (!fs.existsSync(targetFolder)) {
-		fs.mkdirSync(targetFolder);
-	}
-
-	//copy
-	if (fs.lstatSync(source).isDirectory()) {
-		files = fs.readdirSync(source);
-		files.forEach(function (file) {
-			if (ignore && ignore.indexOf(file) !== -1) {
-				return;
-			}
-
-			var curSource = path.join(source, file);
-			var curTarget = path.join(targetFolder, file);
-			if (fs.lstatSync(curSource).isDirectory()) {
-				// ignore grunt files
-				if (file.indexOf('grunt') !== -1) return;
-				if (file === 'chai') return;
-				if (file === 'mocha') return;
-				copyFolderRecursiveSync(curSource, targetFolder, ignore);
-			} else {
-				copyFileSync(curSource, curTarget);
-			}
-		});
-	}
+    var files = [];
+
+    var base = path.basename(source);
+    if (base === adapterName) {
+        base = pkg.name;
+    }
+    //check if folder needs to be created or integrated
+    var targetFolder = path.join(target, base);
+    if (!fs.existsSync(targetFolder)) {
+        fs.mkdirSync(targetFolder);
+    }
+
+    //copy
+    if (fs.lstatSync(source).isDirectory()) {
+        files = fs.readdirSync(source);
+        files.forEach(function (file) {
+            if (ignore && ignore.indexOf(file) !== -1) {
+                return;
+            }
+
+            var curSource = path.join(source, file);
+            var curTarget = path.join(targetFolder, file);
+            if (fs.lstatSync(curSource).isDirectory()) {
+                // ignore grunt files
+                if (file.indexOf('grunt') !== -1) return;
+                if (file === 'chai') return;
+                if (file === 'mocha') return;
+                copyFolderRecursiveSync(curSource, targetFolder, ignore);
+            } else {
+                copyFileSync(curSource, curTarget);
+            }
+        });
+    }
 }
 
 if (!fs.existsSync(rootDir + 'tmp')) {
-	fs.mkdirSync(rootDir + 'tmp');
+    fs.mkdirSync(rootDir + 'tmp');
 }
 
 function storeOriginalFiles() {
-	console.log('Store original files...');
-	var dataDir = rootDir + 'tmp/' + appName + '-data/';
-
-	var f = fs.readFileSync(dataDir + 'objects.json');
-	var objects = JSON.parse(f.toString());
-	if (objects['system.adapter.admin.0'] && objects['system.adapter.admin.0'].common) {
-		objects['system.adapter.admin.0'].common.enabled = false;
-	}
-	if (objects['system.adapter.admin.1'] && objects['system.adapter.admin.1'].common) {
-		objects['system.adapter.admin.1'].common.enabled = false;
-	}
-
-	fs.writeFileSync(dataDir + 'objects.json.original', JSON.stringify(objects));
-	try {
-		f = fs.readFileSync(dataDir + 'states.json');
-		fs.writeFileSync(dataDir + 'states.json.original', f);
-	}
-	catch (err) {
-		console.log('no states.json found - ignore');
-	}
+    console.log('Store original files...');
+    var dataDir = rootDir + 'tmp/' + appName + '-data/';
+
+    var f = fs.readFileSync(dataDir + 'objects.json');
+    var objects = JSON.parse(f.toString());
+    if (objects['system.adapter.admin.0'] && objects['system.adapter.admin.0'].common) {
+        objects['system.adapter.admin.0'].common.enabled = false;
+    }
+    if (objects['system.adapter.admin.1'] && objects['system.adapter.admin.1'].common) {
+        objects['system.adapter.admin.1'].common.enabled = false;
+    }
+
+    fs.writeFileSync(dataDir + 'objects.json.original', JSON.stringify(objects));
+    try {
+        f = fs.readFileSync(dataDir + 'states.json');
+        fs.writeFileSync(dataDir + 'states.json.original', f);
+    }
+    catch (err) {
+        console.log('no states.json found - ignore');
+    }
 }
 
 function restoreOriginalFiles() {
-	console.log('restoreOriginalFiles...');
-	var dataDir = rootDir + 'tmp/' + appName + '-data/';
-
-	var f = fs.readFileSync(dataDir + 'objects.json.original');
-	fs.writeFileSync(dataDir + 'objects.json', f);
-	try {
-		f = fs.readFileSync(dataDir + 'states.json.original');
-		fs.writeFileSync(dataDir + 'states.json', f);
-	}
-	catch (err) {
-		console.log('no states.json.original found - ignore');
-	}
+    console.log('restoreOriginalFiles...');
+    var dataDir = rootDir + 'tmp/' + appName + '-data/';
+
+    var f = fs.readFileSync(dataDir + 'objects.json.original');
+    fs.writeFileSync(dataDir + 'objects.json', f);
+    try {
+        f = fs.readFileSync(dataDir + 'states.json.original');
+        fs.writeFileSync(dataDir + 'states.json', f);
+    }
+    catch (err) {
+        console.log('no states.json.original found - ignore');
+    }
 
 }
 
 function checkIsAdapterInstalled(cb, counter, customName) {
-	customName = customName || pkg.name.split('.').pop();
-	counter = counter || 0;
-	var dataDir = rootDir + 'tmp/' + appName + '-data/';
-	console.log('checkIsAdapterInstalled...');
-
-	try {
-		var f = fs.readFileSync(dataDir + 'objects.json');
-		var objects = JSON.parse(f.toString());
-		if (objects['system.adapter.' + customName + '.0']) {
-			console.log('checkIsAdapterInstalled: ready!');
-			setTimeout(function () {
-				if (cb) cb();
-			}, 100);
-			return;
-		} else {
-			console.warn('checkIsAdapterInstalled: still not ready');
-		}
-	} catch (err) {
-
-	}
-
-	if (counter > 20) {
-		console.error('checkIsAdapterInstalled: Cannot install!');
-		if (cb) cb('Cannot install');
-	} else {
-		console.log('checkIsAdapterInstalled: wait...');
-		setTimeout(function() {
-			checkIsAdapterInstalled(cb, counter + 1);
-		}, 1000);
-	}
+    customName = customName || pkg.name.split('.').pop();
+    counter = counter || 0;
+    var dataDir = rootDir + 'tmp/' + appName + '-data/';
+    console.log('checkIsAdapterInstalled...');
+
+    try {
+        var f = fs.readFileSync(dataDir + 'objects.json');
+        var objects = JSON.parse(f.toString());
+        if (objects['system.adapter.' + customName + '.0']) {
+            console.log('checkIsAdapterInstalled: ready!');
+            setTimeout(function () {
+                if (cb) cb();
+            }, 100);
+            return;
+        } else {
+            console.warn('checkIsAdapterInstalled: still not ready');
+        }
+    } catch (err) {
+
+    }
+
+    if (counter > 20) {
+        console.error('checkIsAdapterInstalled: Cannot install!');
+        if (cb) cb('Cannot install');
+    } else {
+        console.log('checkIsAdapterInstalled: wait...');
+        setTimeout(function() {
+            checkIsAdapterInstalled(cb, counter + 1);
+        }, 1000);
+    }
 }
 
 function checkIsControllerInstalled(cb, counter) {
-	counter = counter || 0;
-	var dataDir = rootDir + 'tmp/' + appName + '-data/';
-
-	console.log('checkIsControllerInstalled...');
-	try {
-		var f = fs.readFileSync(dataDir + 'objects.json');
-		var objects = JSON.parse(f.toString());
-		if (objects['system.adapter.admin.0']) {
-			console.log('checkIsControllerInstalled: installed!');
-			setTimeout(function () {
-				if (cb) cb();
-			}, 100);
-			return;
-		}
-	} catch (err) {
-
-	}
-
-	if (counter > 20) {
-		console.log('checkIsControllerInstalled: Cannot install!');
-		if (cb) cb('Cannot install');
-	} else {
-		console.log('checkIsControllerInstalled: wait...');
-		setTimeout(function() {
-			checkIsControllerInstalled(cb, counter + 1);
-		}, 1000);
-	}
+    counter = counter || 0;
+    var dataDir = rootDir + 'tmp/' + appName + '-data/';
+
+    console.log('checkIsControllerInstalled...');
+    try {
+        var f = fs.readFileSync(dataDir + 'objects.json');
+        var objects = JSON.parse(f.toString());
+        if (objects['system.adapter.admin.0']) {
+            console.log('checkIsControllerInstalled: installed!');
+            setTimeout(function () {
+                if (cb) cb();
+            }, 100);
+            return;
+        }
+    } catch (err) {
+
+    }
+
+    if (counter > 20) {
+        console.log('checkIsControllerInstalled: Cannot install!');
+        if (cb) cb('Cannot install');
+    } else {
+        console.log('checkIsControllerInstalled: wait...');
+        setTimeout(function() {
+            checkIsControllerInstalled(cb, counter + 1);
+        }, 1000);
+    }
 }
 
 function installAdapter(customName, cb) {
-	if (typeof customName === 'function') {
-		cb = customName;
-		customName = null;
-	}
-	customName = customName || pkg.name.split('.').pop();
-	console.log('Install adapter...');
-	var startFile = 'node_modules/' + appName + '.js-controller/' + appName + '.js';
-	// make first install
-	if (debug) {
-		child_process.execSync('node ' + startFile + ' add ' + customName + ' --enabled false', {
-			cwd:   rootDir + 'tmp',
-			stdio: [0, 1, 2]
-		});
-		checkIsAdapterInstalled(function (error) {
-			if (error) console.error(error);
-			console.log('Adapter installed.');
-			if (cb) cb();
-		});
-	} else {
-		// add controller
-		var _pid = child_process.fork(startFile, ['add', customName, '--enabled', 'false'], {
-			cwd:   rootDir + 'tmp',
-			stdio: [0, 1, 2, 'ipc']
-		});
-
-		waitForEnd(_pid, function () {
-			checkIsAdapterInstalled(function (error) {
-				if (error) console.error(error);
-				console.log('Adapter installed.');
-				if (cb) cb();
-			});
-		});
-	}
+    if (typeof customName === 'function') {
+        cb = customName;
+        customName = null;
+    }
+    customName = customName || pkg.name.split('.').pop();
+    console.log('Install adapter...');
+    var startFile = 'node_modules/' + appName + '.js-controller/' + appName + '.js';
+    // make first install
+    if (debug) {
+        child_process.execSync('node ' + startFile + ' add ' + customName + ' --enabled false', {
+            cwd:   rootDir + 'tmp',
+            stdio: [0, 1, 2]
+        });
+        checkIsAdapterInstalled(function (error) {
+            if (error) console.error(error);
+            console.log('Adapter installed.');
+            if (cb) cb();
+        });
+    } else {
+        // add controller
+        var _pid = child_process.fork(startFile, ['add', customName, '--enabled', 'false'], {
+            cwd:   rootDir + 'tmp',
+            stdio: [0, 1, 2, 'ipc']
+        });
+
+        waitForEnd(_pid, function () {
+            checkIsAdapterInstalled(function (error) {
+                if (error) console.error(error);
+                console.log('Adapter installed.');
+                if (cb) cb();
+            });
+        });
+    }
 }
 
 function waitForEnd(_pid, cb) {
-	if (!_pid) {
-		cb(-1, -1);
-		return;
-	}
-	_pid.on('exit', function (code, signal) {
-		if (_pid) {
-			_pid = null;
-			cb(code, signal);
-		}
-	});
-	_pid.on('close', function (code, signal) {
-		if (_pid) {
-			_pid = null;
-			cb(code, signal);
-		}
-	});
+    if (!_pid) {
+        cb(-1, -1);
+        return;
+    }
+    _pid.on('exit', function (code, signal) {
+        if (_pid) {
+            _pid = null;
+            cb(code, signal);
+        }
+    });
+    _pid.on('close', function (code, signal) {
+        if (_pid) {
+            _pid = null;
+            cb(code, signal);
+        }
+    });
 }
 
 function installJsController(cb) {
-	console.log('installJsController...');
-	if (!fs.existsSync(rootDir + 'tmp/node_modules/' + appName + '.js-controller') ||
-		!fs.existsSync(rootDir + 'tmp/' + appName + '-data')) {
-		// try to detect appName.js-controller in node_modules/appName.js-controller
-		// travis CI installs js-controller into node_modules
-		if (fs.existsSync(rootDir + 'node_modules/' + appName + '.js-controller')) {
-			console.log('installJsController: no js-controller => copy it from "' + rootDir + 'node_modules/' + appName + '.js-controller"');
-			// copy all
-			// stop controller
-			console.log('Stop controller if running...');
-			var _pid;
-			if (debug) {
-				// start controller
-				_pid = child_process.exec('node ' + appName + '.js stop', {
-					cwd: rootDir + 'node_modules/' + appName + '.js-controller',
-					stdio: [0, 1, 2]
-				});
-			} else {
-				_pid = child_process.fork(appName + '.js', ['stop'], {
-					cwd:   rootDir + 'node_modules/' + appName + '.js-controller',
-					stdio: [0, 1, 2, 'ipc']
-				});
-			}
-
-			waitForEnd(_pid, function () {
-				// copy all files into
-				if (!fs.existsSync(rootDir + 'tmp')) fs.mkdirSync(rootDir + 'tmp');
-				if (!fs.existsSync(rootDir + 'tmp/node_modules')) fs.mkdirSync(rootDir + 'tmp/node_modules');
-
-				if (!fs.existsSync(rootDir + 'tmp/node_modules/' + appName + '.js-controller')){
-					console.log('Copy js-controller...');
-					copyFolderRecursiveSync(rootDir + 'node_modules/' + appName + '.js-controller', rootDir + 'tmp/node_modules/');
-				}
-
-				console.log('Setup js-controller...');
-				var __pid;
-				if (debug) {
-					// start controller
-					_pid = child_process.exec('node ' + appName + '.js setup first --console', {
-						cwd: rootDir + 'tmp/node_modules/' + appName + '.js-controller',
-						stdio: [0, 1, 2]
-					});
-				} else {
-					__pid = child_process.fork(appName + '.js', ['setup', 'first', '--console'], {
-						cwd:   rootDir + 'tmp/node_modules/' + appName + '.js-controller',
-						stdio: [0, 1, 2, 'ipc']
-					});
-				}
-				waitForEnd(__pid, function () {
-					checkIsControllerInstalled(function () {
-						// change ports for object and state DBs
-						var config = require(rootDir + 'tmp/' + appName + '-data/' + appName + '.json');
-						config.objects.port = 19001;
-						config.states.port  = 19000;
-						fs.writeFileSync(rootDir + 'tmp/' + appName + '-data/' + appName + '.json', JSON.stringify(config, null, 2));
-						console.log('Setup finished.');
-
-						copyAdapterToController();
-
-						installAdapter(function () {
-							storeOriginalFiles();
-							if (cb) cb(true);
-						});
-					});
-				});
-			});
-		} else {
-			// check if port 9000 is free, else admin adapter will be added to running instance
-			var client = new require('net').Socket();
-			client.connect(9000, '127.0.0.1', function() {
-				console.error('Cannot initiate fisrt run of test, because one instance of application is running on this PC. Stop it and repeat.');
-				process.exit(0);
-			});
-
-			setTimeout(function () {
-				client.destroy();
-				if (!fs.existsSync(rootDir + 'tmp/node_modules/' + appName + '.js-controller')) {
-					console.log('installJsController: no js-controller => install from git');
-
-					child_process.execSync('npm install https://github.com/' + appName + '/' + appName + '.js-controller/tarball/master --prefix ./  --production', {
-						cwd:   rootDir + 'tmp/',
-						stdio: [0, 1, 2]
-					});
-				} else {
-					console.log('Setup js-controller...');
-					var __pid;
-					if (debug) {
-						// start controller
-						child_process.exec('node ' + appName + '.js setup first', {
-							cwd: rootDir + 'tmp/node_modules/' + appName + '.js-controller',
-							stdio: [0, 1, 2]
-						});
-					} else {
-						child_process.fork(appName + '.js', ['setup', 'first'], {
-							cwd:   rootDir + 'tmp/node_modules/' + appName + '.js-controller',
-							stdio: [0, 1, 2, 'ipc']
-						});
-					}
-				}
-
-				// let npm install admin and run setup
-				checkIsControllerInstalled(function () {
-					var _pid;
-
-					if (fs.existsSync(rootDir + 'node_modules/' + appName + '.js-controller/' + appName + '.js')) {
-						_pid = child_process.fork(appName + '.js', ['stop'], {
-							cwd:   rootDir + 'node_modules/' + appName + '.js-controller',
-							stdio: [0, 1, 2, 'ipc']
-						});
-					}
-
-					waitForEnd(_pid, function () {
-						// change ports for object and state DBs
-						var config = require(rootDir + 'tmp/' + appName + '-data/' + appName + '.json');
-						config.objects.port = 19001;
-						config.states.port  = 19000;
-						fs.writeFileSync(rootDir + 'tmp/' + appName + '-data/' + appName + '.json', JSON.stringify(config, null, 2));
-
-						copyAdapterToController();
-
-						installAdapter(function () {
-							storeOriginalFiles();
-							if (cb) cb(true);
-						});
-					});
-				});
-			}, 1000);
-		}
-	} else {
-		setTimeout(function () {
-			console.log('installJsController: js-controller installed');
-			if (cb) cb(false);
-		}, 0);
-	}
+    console.log('installJsController...');
+    if (!fs.existsSync(rootDir + 'tmp/node_modules/' + appName + '.js-controller') ||
+        !fs.existsSync(rootDir + 'tmp/' + appName + '-data')) {
+        // try to detect appName.js-controller in node_modules/appName.js-controller
+        // travis CI installs js-controller into node_modules
+        if (fs.existsSync(rootDir + 'node_modules/' + appName + '.js-controller')) {
+            console.log('installJsController: no js-controller => copy it from "' + rootDir + 'node_modules/' + appName + '.js-controller"');
+            // copy all
+            // stop controller
+            console.log('Stop controller if running...');
+            var _pid;
+            if (debug) {
+                // start controller
+                _pid = child_process.exec('node ' + appName + '.js stop', {
+                    cwd: rootDir + 'node_modules/' + appName + '.js-controller',
+                    stdio: [0, 1, 2]
+                });
+            } else {
+                _pid = child_process.fork(appName + '.js', ['stop'], {
+                    cwd:   rootDir + 'node_modules/' + appName + '.js-controller',
+                    stdio: [0, 1, 2, 'ipc']
+                });
+            }
+
+            waitForEnd(_pid, function () {
+                // copy all files into
+                if (!fs.existsSync(rootDir + 'tmp')) fs.mkdirSync(rootDir + 'tmp');
+                if (!fs.existsSync(rootDir + 'tmp/node_modules')) fs.mkdirSync(rootDir + 'tmp/node_modules');
+
+                if (!fs.existsSync(rootDir + 'tmp/node_modules/' + appName + '.js-controller')){
+                    console.log('Copy js-controller...');
+                    copyFolderRecursiveSync(rootDir + 'node_modules/' + appName + '.js-controller', rootDir + 'tmp/node_modules/');
+                }
+
+                console.log('Setup js-controller...');
+                var __pid;
+                if (debug) {
+                    // start controller
+                    _pid = child_process.exec('node ' + appName + '.js setup first --console', {
+                        cwd: rootDir + 'tmp/node_modules/' + appName + '.js-controller',
+                        stdio: [0, 1, 2]
+                    });
+                } else {
+                    __pid = child_process.fork(appName + '.js', ['setup', 'first', '--console'], {
+                        cwd:   rootDir + 'tmp/node_modules/' + appName + '.js-controller',
+                        stdio: [0, 1, 2, 'ipc']
+                    });
+                }
+                waitForEnd(__pid, function () {
+                    checkIsControllerInstalled(function () {
+                        // change ports for object and state DBs
+                        var config = require(rootDir + 'tmp/' + appName + '-data/' + appName + '.json');
+                        config.objects.port = 19001;
+                        config.states.port  = 19000;
+                        fs.writeFileSync(rootDir + 'tmp/' + appName + '-data/' + appName + '.json', JSON.stringify(config, null, 2));
+                        console.log('Setup finished.');
+
+                        copyAdapterToController();
+
+                        installAdapter(function () {
+                            storeOriginalFiles();
+                            if (cb) cb(true);
+                        });
+                    });
+                });
+            });
+        } else {
+            // check if port 9000 is free, else admin adapter will be added to running instance
+            var client = new require('net').Socket();
+            client.on('error', () => {});
+            client.connect(9000, '127.0.0.1', function() {
+                console.error('Cannot initiate fisrt run of test, because one instance of application is running on this PC. Stop it and repeat.');
+                process.exit(0);
+            });
+
+            setTimeout(function () {
+                client.destroy();
+                if (!fs.existsSync(rootDir + 'tmp/node_modules/' + appName + '.js-controller')) {
+                    console.log('installJsController: no js-controller => install from git');
+
+                    child_process.execSync('npm install https://github.com/' + appName + '/' + appName + '.js-controller/tarball/master --prefix ./  --production', {
+                        cwd:   rootDir + 'tmp/',
+                        stdio: [0, 1, 2]
+                    });
+                } else {
+                    console.log('Setup js-controller...');
+                    var __pid;
+                    if (debug) {
+                        // start controller
+                        child_process.exec('node ' + appName + '.js setup first', {
+                            cwd: rootDir + 'tmp/node_modules/' + appName + '.js-controller',
+                            stdio: [0, 1, 2]
+                        });
+                    } else {
+                        child_process.fork(appName + '.js', ['setup', 'first'], {
+                            cwd:   rootDir + 'tmp/node_modules/' + appName + '.js-controller',
+                            stdio: [0, 1, 2, 'ipc']
+                        });
+                    }
+                }
+
+                // let npm install admin and run setup
+                checkIsControllerInstalled(function () {
+                    var _pid;
+
+                    if (fs.existsSync(rootDir + 'node_modules/' + appName + '.js-controller/' + appName + '.js')) {
+                        _pid = child_process.fork(appName + '.js', ['stop'], {
+                            cwd:   rootDir + 'node_modules/' + appName + '.js-controller',
+                            stdio: [0, 1, 2, 'ipc']
+                        });
+                    }
+
+                    waitForEnd(_pid, function () {
+                        // change ports for object and state DBs
+                        var config = require(rootDir + 'tmp/' + appName + '-data/' + appName + '.json');
+                        config.objects.port = 19001;
+                        config.states.port  = 19000;
+                        fs.writeFileSync(rootDir + 'tmp/' + appName + '-data/' + appName + '.json', JSON.stringify(config, null, 2));
+
+                        copyAdapterToController();
+
+                        installAdapter(function () {
+                            storeOriginalFiles();
+                            if (cb) cb(true);
+                        });
+                    });
+                });
+            }, 1000);
+        }
+    } else {
+        setTimeout(function () {
+            console.log('installJsController: js-controller installed');
+            if (cb) cb(false);
+        }, 0);
+    }
 }
 
 function copyAdapterToController() {
-	console.log('Copy adapter...');
-	// Copy adapter to tmp/node_modules/appName.adapter
-	copyFolderRecursiveSync(rootDir, rootDir + 'tmp/node_modules/', ['.idea', 'test', 'tmp', '.git', appName + '.js-controller']);
-	console.log('Adapter copied.');
+    console.log('Copy adapter...');
+    // Copy adapter to tmp/node_modules/appName.adapter
+    copyFolderRecursiveSync(rootDir, rootDir + 'tmp/node_modules/', ['.idea', 'test', 'tmp', '.git', appName + '.js-controller']);
+    console.log('Adapter copied.');
 }
 
 function clearControllerLog() {
-	var dirPath = rootDir + 'tmp/log';
-	var files;
-	try {
-		if (fs.existsSync(dirPath)) {
-			console.log('Clear controller log...');
-			files = fs.readdirSync(dirPath);
-		} else {
-			console.log('Create controller log directory...');
-			files = [];
-			fs.mkdirSync(dirPath);
-		}
-	} catch(e) {
-		console.error('Cannot read "' + dirPath + '"');
-		return;
-	}
-	if (files.length > 0) {
-		try {
-			for (var i = 0; i < files.length; i++) {
-				var filePath = dirPath + '/' + files[i];
-				fs.unlinkSync(filePath);
-			}
-			console.log('Controller log cleared');
-		} catch (err) {
-			console.error('cannot clear log: ' + err);
-		}
-	}
+    var dirPath = rootDir + 'tmp/log';
+    var files;
+    try {
+        if (fs.existsSync(dirPath)) {
+            console.log('Clear controller log...');
+            files = fs.readdirSync(dirPath);
+        } else {
+            console.log('Create controller log directory...');
+            files = [];
+            fs.mkdirSync(dirPath);
+        }
+    } catch(e) {
+        console.error('Cannot read "' + dirPath + '"');
+        return;
+    }
+    if (files.length > 0) {
+        try {
+            for (var i = 0; i < files.length; i++) {
+                var filePath = dirPath + '/' + files[i];
+                fs.unlinkSync(filePath);
+            }
+            console.log('Controller log cleared');
+        } catch (err) {
+            console.error('cannot clear log: ' + err);
+        }
+    }
 }
 
 function clearDB() {
-	var dirPath = rootDir + 'tmp/iobroker-data/sqlite';
-	var files;
-	try {
-		if (fs.existsSync(dirPath)) {
-			console.log('Clear sqlite DB...');
-			files = fs.readdirSync(dirPath);
-		} else {
-			console.log('Create controller log directory...');
-			files = [];
-			fs.mkdirSync(dirPath);
-		}
-	} catch(e) {
-		console.error('Cannot read "' + dirPath + '"');
-		return;
-	}
-	if (files.length > 0) {
-		try {
-			for (var i = 0; i < files.length; i++) {
-				var filePath = dirPath + '/' + files[i];
-				fs.unlinkSync(filePath);
-			}
-			console.log('Clear sqlite DB');
-		} catch (err) {
-			console.error('cannot clear DB: ' + err);
-		}
-	}
+    var dirPath = rootDir + 'tmp/iobroker-data/sqlite';
+    var files;
+    try {
+        if (fs.existsSync(dirPath)) {
+            console.log('Clear sqlite DB...');
+            files = fs.readdirSync(dirPath);
+        } else {
+            console.log('Create controller log directory...');
+            files = [];
+            fs.mkdirSync(dirPath);
+        }
+    } catch(e) {
+        console.error('Cannot read "' + dirPath + '"');
+        return;
+    }
+    if (files.length > 0) {
+        try {
+            for (var i = 0; i < files.length; i++) {
+                var filePath = dirPath + '/' + files[i];
+                fs.unlinkSync(filePath);
+            }
+            console.log('Clear sqlite DB');
+        } catch (err) {
+            console.error('cannot clear DB: ' + err);
+        }
+    }
 }
 
 function setupController(cb) {
-	installJsController(function (isInited) {
-		clearControllerLog();
-		clearDB();
-
-		if (!isInited) {
-			restoreOriginalFiles();
-			copyAdapterToController();
-		}
-		// read system.config object
-		var dataDir = rootDir + 'tmp/' + appName + '-data/';
-
-		var objs;
-		try {
-			objs = fs.readFileSync(dataDir + 'objects.json');
-			objs = JSON.parse(objs);
-		}
-		catch (e) {
-			console.log('ERROR reading/parsing system configuration. Ignore');
-			objs = {'system.config': {}};
-		}
-		if (!objs || !objs['system.config']) {
-			objs = {'system.config': {}};
-		}
-
-		if (cb) cb(objs['system.config']);
-	});
+    installJsController(function (isInited) {
+        clearControllerLog();
+        clearDB();
+
+        if (!isInited) {
+            restoreOriginalFiles();
+            copyAdapterToController();
+        }
+        // read system.config object
+        var dataDir = rootDir + 'tmp/' + appName + '-data/';
+
+        var objs;
+        try {
+            objs = fs.readFileSync(dataDir + 'objects.json');
+            objs = JSON.parse(objs);
+        }
+        catch (e) {
+            console.log('ERROR reading/parsing system configuration. Ignore');
+            objs = {'system.config': {}};
+        }
+        if (!objs || !objs['system.config']) {
+            objs = {'system.config': {}};
+        }
+
+        if (cb) cb(objs['system.config']);
+    });
 }
 
 function startAdapter(objects, states, callback) {
-	if (adapterStarted) {
-		console.log('Adapter already started ...');
-		if (callback) callback(objects, states);
-		return;
-	}
-	adapterStarted = true;
-	console.log('startAdapter...');
-	if (fs.existsSync(rootDir + 'tmp/node_modules/' + pkg.name + '/' + pkg.main)) {
-		try {
-			if (debug) {
-				// start controller
-				pid = child_process.exec('node node_modules/' + pkg.name + '/' + pkg.main + ' --console silly', {
-					cwd: rootDir + 'tmp',
-					stdio: [0, 1, 2]
-				});
-			} else {
-				// start controller
-				pid = child_process.fork('node_modules/' + pkg.name + '/' + pkg.main, ['--console', 'silly'], {
-					cwd:   rootDir + 'tmp',
-					stdio: [0, 1, 2, 'ipc']
-				});
-			}
-		} catch (error) {
-			console.error(JSON.stringify(error));
-		}
-	} else {
-		console.error('Cannot find: ' + rootDir + 'tmp/node_modules/' + pkg.name + '/' + pkg.main);
-	}
-	if (callback) callback(objects, states);
+    if (adapterStarted) {
+        console.log('Adapter already started ...');
+        if (callback) callback(objects, states);
+        return;
+    }
+    adapterStarted = true;
+    console.log('startAdapter...');
+    if (fs.existsSync(rootDir + 'tmp/node_modules/' + pkg.name + '/' + pkg.main)) {
+        try {
+            if (debug) {
+                // start controller
+                pid = child_process.exec('node node_modules/' + pkg.name + '/' + pkg.main + ' --console silly', {
+                    cwd: rootDir + 'tmp',
+                    stdio: [0, 1, 2]
+                });
+            } else {
+                // start controller
+                pid = child_process.fork('node_modules/' + pkg.name + '/' + pkg.main, ['--console', 'silly'], {
+                    cwd:   rootDir + 'tmp',
+                    stdio: [0, 1, 2, 'ipc']
+                });
+            }
+        } catch (error) {
+            console.error(JSON.stringify(error));
+        }
+    } else {
+        console.error('Cannot find: ' + rootDir + 'tmp/node_modules/' + pkg.name + '/' + pkg.main);
+    }
+    if (callback) callback(objects, states);
 }
 
 function startController(isStartAdapter, onObjectChange, onStateChange, callback) {
-	if (typeof isStartAdapter === 'function') {
-		callback = onStateChange;
-		onStateChange = onObjectChange;
-		onObjectChange = isStartAdapter;
-		isStartAdapter = true;
-	}
-
-	if (onStateChange === undefined) {
-		callback  = onObjectChange;
-		onObjectChange = undefined;
-	}
-
-	if (pid) {
-		console.error('Controller is already started!');
-	} else {
-		console.log('startController...');
-		adapterStarted = false;
-		var isObjectConnected;
-		var isStatesConnected;
-
-		var Objects = require(rootDir + 'tmp/node_modules/' + appName + '.js-controller/lib/objects/objectsInMemServer');
-		objects = new Objects({
-			connection: {
-				"type" : "file",
-				"host" : "127.0.0.1",
-				"port" : 19001,
-				"user" : "",
-				"pass" : "",
-				"noFileCache": false,
-				"connectTimeout": 2000
-			},
-			logger: {
-				silly: function (msg) {
-					console.log(msg);
-				},
-				debug: function (msg) {
-					console.log(msg);
-				},
-				info: function (msg) {
-					console.log(msg);
-				},
-				warn: function (msg) {
-					console.warn(msg);
-				},
-				error: function (msg) {
-					console.error(msg);
-				}
-			},
-			connected: function () {
-				isObjectConnected = true;
-				if (isStatesConnected) {
-					console.log('startController: started!');
-					if (isStartAdapter) {
-						startAdapter(objects, states, callback);
-					} else {
-						if (callback) {
-							callback(objects, states);
-							callback = null;
-						}
-					}
-				}
-			},
-			change: onObjectChange
-		});
-
-		// Just open in memory DB itself
-		var States = require(rootDir + 'tmp/node_modules/' + appName + '.js-controller/lib/states/statesInMemServer');
-		states = new States({
-			connection: {
-				type: 'file',
-				host: '127.0.0.1',
-				port: 19000,
-				options: {
-					auth_pass: null,
-					retry_max_delay: 15000
-				}
-			},
-			logger: {
-				silly: function (msg) {
-					console.log(msg);
-				},
-				debug: function (msg) {
-					console.log(msg);
-				},
-				info: function (msg) {
-					console.log(msg);
-				},
-				warn: function (msg) {
-					console.log(msg);
-				},
-				error: function (msg) {
-					console.log(msg);
-				}
-			},
-			connected: function () {
-				isStatesConnected = true;
-				if (isObjectConnected) {
-					console.log('startController: started!!');
-					if (isStartAdapter) {
-						startAdapter(objects, states, callback);
-					} else {
-						if (callback) {
-							callback(objects, states);
-							callback = null;
-						}
-					}
-				}
-			},
-			change: onStateChange
-		});
-	}
+    if (typeof isStartAdapter === 'function') {
+        callback = onStateChange;
+        onStateChange = onObjectChange;
+        onObjectChange = isStartAdapter;
+        isStartAdapter = true;
+    }
+
+    if (onStateChange === undefined) {
+        callback  = onObjectChange;
+        onObjectChange = undefined;
+    }
+
+    if (pid) {
+        console.error('Controller is already started!');
+    } else {
+        console.log('startController...');
+        adapterStarted = false;
+        var isObjectConnected;
+        var isStatesConnected;
+
+        var Objects = require(rootDir + 'tmp/node_modules/' + appName + '.js-controller/lib/objects/objectsInMemServer');
+        objects = new Objects({
+            connection: {
+                "type" : "file",
+                "host" : "127.0.0.1",
+                "port" : 19001,
+                "user" : "",
+                "pass" : "",
+                "noFileCache": false,
+                "connectTimeout": 2000
+            },
+            logger: {
+                silly: function (msg) {
+                    console.log(msg);
+                },
+                debug: function (msg) {
+                    console.log(msg);
+                },
+                info: function (msg) {
+                    console.log(msg);
+                },
+                warn: function (msg) {
+                    console.warn(msg);
+                },
+                error: function (msg) {
+                    console.error(msg);
+                }
+            },
+            connected: function () {
+                isObjectConnected = true;
+                if (isStatesConnected) {
+                    console.log('startController: started!');
+                    if (isStartAdapter) {
+                        startAdapter(objects, states, callback);
+                    } else {
+                        if (callback) {
+                            callback(objects, states);
+                            callback = null;
+                        }
+                    }
+                }
+            },
+            change: onObjectChange
+        });
+
+        // Just open in memory DB itself
+        var States = require(rootDir + 'tmp/node_modules/' + appName + '.js-controller/lib/states/statesInMemServer');
+        states = new States({
+            connection: {
+                type: 'file',
+                host: '127.0.0.1',
+                port: 19000,
+                options: {
+                    auth_pass: null,
+                    retry_max_delay: 15000
+                }
+            },
+            logger: {
+                silly: function (msg) {
+                    console.log(msg);
+                },
+                debug: function (msg) {
+                    console.log(msg);
+                },
+                info: function (msg) {
+                    console.log(msg);
+                },
+                warn: function (msg) {
+                    console.log(msg);
+                },
+                error: function (msg) {
+                    console.log(msg);
+                }
+            },
+            connected: function () {
+                isStatesConnected = true;
+                if (isObjectConnected) {
+                    console.log('startController: started!!');
+                    if (isStartAdapter) {
+                        startAdapter(objects, states, callback);
+                    } else {
+                        if (callback) {
+                            callback(objects, states);
+                            callback = null;
+                        }
+                    }
+                }
+            },
+            change: onStateChange
+        });
+    }
 }
 
 function stopAdapter(cb) {
-	if (!pid) {
-		console.error('Controller is not running!');
-		if (cb) {
-			setTimeout(function () {
-				cb(false);
-			}, 0);
-		}
-	} else {
-		adapterStarted = false;
-		pid.on('exit', function (code, signal) {
-			if (pid) {
-				console.log('child process terminated due to receipt of signal ' + signal);
-				if (cb) cb();
-				pid = null;
-			}
-		});
-
-		pid.on('close', function (code, signal) {
-			if (pid) {
-				if (cb) cb();
-				pid = null;
-			}
-		});
-
-		pid.kill('SIGTERM');
-	}
+    if (!pid) {
+        console.error('Controller is not running!');
+        if (cb) {
+            setTimeout(function () {
+                cb(false);
+            }, 0);
+        }
+    } else {
+        adapterStarted = false;
+        pid.on('exit', function (code, signal) {
+            if (pid) {
+                console.log('child process terminated due to receipt of signal ' + signal);
+                if (cb) cb();
+                pid = null;
+            }
+        });
+
+        pid.on('close', function (code, signal) {
+            if (pid) {
+                if (cb) cb();
+                pid = null;
+            }
+        });
+
+        pid.kill('SIGTERM');
+    }
 }
 
 function _stopController() {
-	if (objects) {
-		objects.destroy();
-		objects = null;
-	}
-	if (states) {
-		states.destroy();
-		states = null;
-	}
+    if (objects) {
+        objects.destroy();
+        objects = null;
+    }
+    if (states) {
+        states.destroy();
+        states = null;
+    }
 }
 
 function stopController(cb) {
-	var timeout;
-	if (objects) {
-		console.log('Set system.adapter.' + pkg.name + '.0');
-		objects.setObject('system.adapter.' + pkg.name + '.0', {
-			common:{
-				enabled: false
-			}
-		});
-	}
-
-	stopAdapter(function () {
-		if (timeout) {
-			clearTimeout(timeout);
-			timeout = null;
-		}
-
-		_stopController();
-
-		if (cb) {
-			cb(true);
-			cb = null;
-		}
-	});
-
-	timeout = setTimeout(function () {
-		timeout = null;
-		console.log('child process NOT terminated');
-
-		_stopController();
-
-		if (cb) {
-			cb(false);
-			cb = null;
-		}
-		pid = null;
-	}, 5000);
+    var timeout;
+    if (objects) {
+        console.log('Set system.adapter.' + pkg.name + '.0');
+        objects.setObject('system.adapter.' + pkg.name + '.0', {
+            common:{
+                enabled: false
+            }
+        });
+    }
+
+    stopAdapter(function () {
+        if (timeout) {
+            clearTimeout(timeout);
+            timeout = null;
+        }
+
+        _stopController();
+
+        if (cb) {
+            cb(true);
+            cb = null;
+        }
+    });
+
+    timeout = setTimeout(function () {
+        timeout = null;
+        console.log('child process NOT terminated');
+
+        _stopController();
+
+        if (cb) {
+            cb(false);
+            cb = null;
+        }
+        pid = null;
+    }, 5000);
 }
 
 // Setup the adapter
 function setAdapterConfig(common, native, instance) {
-	var objects = JSON.parse(fs.readFileSync(rootDir + 'tmp/' + appName + '-data/objects.json').toString());
-	var id = 'system.adapter.' + adapterName.split('.').pop() + '.' + (instance || 0);
-	if (common) objects[id].common = common;
-	if (native) objects[id].native = native;
-	fs.writeFileSync(rootDir + 'tmp/' + appName + '-data/objects.json', JSON.stringify(objects));
+    var objects = JSON.parse(fs.readFileSync(rootDir + 'tmp/' + appName + '-data/objects.json').toString());
+    var id = 'system.adapter.' + adapterName.split('.').pop() + '.' + (instance || 0);
+    if (common) objects[id].common = common;
+    if (native) objects[id].native = native;
+    fs.writeFileSync(rootDir + 'tmp/' + appName + '-data/objects.json', JSON.stringify(objects));
 }
 
 // Read config of the adapter
 function getAdapterConfig(instance) {
-	var objects = JSON.parse(fs.readFileSync(rootDir + 'tmp/' + appName + '-data/objects.json').toString());
-	var id      = 'system.adapter.' + adapterName.split('.').pop() + '.' + (instance || 0);
-	return objects[id];
+    var objects = JSON.parse(fs.readFileSync(rootDir + 'tmp/' + appName + '-data/objects.json').toString());
+    var id      = 'system.adapter.' + adapterName.split('.').pop() + '.' + (instance || 0);
+    return objects[id];
 }
 
 if (typeof module !== undefined && module.parent) {
-	module.exports.getAdapterConfig = getAdapterConfig;
-	module.exports.setAdapterConfig = setAdapterConfig;
-	module.exports.startController  = startController;
-	module.exports.stopController   = stopController;
-	module.exports.setupController  = setupController;
-	module.exports.stopAdapter      = stopAdapter;
-	module.exports.startAdapter     = startAdapter;
-	module.exports.installAdapter   = installAdapter;
-	module.exports.appName          = appName;
-	module.exports.adapterName      = adapterName;
-	module.exports.adapterStarted   = adapterStarted;
-}
\ No newline at end of file
+    module.exports.getAdapterConfig = getAdapterConfig;
+    module.exports.setAdapterConfig = setAdapterConfig;
+    module.exports.startController  = startController;
+    module.exports.stopController   = stopController;
+    module.exports.setupController  = setupController;
+    module.exports.stopAdapter      = stopAdapter;
+    module.exports.startAdapter     = startAdapter;
+    module.exports.installAdapter   = installAdapter;
+    module.exports.appName          = appName;
+    module.exports.adapterName      = adapterName;
+    module.exports.adapterStarted   = adapterStarted;
+}
diff --git a/test/testPackageFiles.js b/test/testPackageFiles.js
index 62c64835..a63e6bcf 100644
--- a/test/testPackageFiles.js
+++ b/test/testPackageFiles.js
@@ -2,90 +2,94 @@
 /* jshint strict:false */
 /* jslint node: true */
 /* jshint expr: true */
-var expect = require('chai').expect;
-var fs        = require('fs');
+'use strict';
 
-describe('Test package.json and io-package.json', function() {
-	it('Test package files', function (done) {
-		console.log();
+const expect = require('chai').expect;
+const fs     = require('fs');
 
-		var fileContentIOPackage = fs.readFileSync(__dirname + '/../io-package.json', 'utf8');
-		var ioPackage = JSON.parse(fileContentIOPackage);
+describe('Test package.json and io-package.json', () => {
+    it('Test package files', done => {
+        console.log();
 
-		var fileContentNPMPackage = fs.readFileSync(__dirname + '/../package.json', 'utf8');
-		var npmPackage = JSON.parse(fileContentNPMPackage);
+        const fileContentIOPackage = fs.readFileSync(__dirname + '/../io-package.json', 'utf8');
+        const ioPackage = JSON.parse(fileContentIOPackage);
 
-		expect(ioPackage).to.be.an('object');
-		expect(npmPackage).to.be.an('object');
+        const fileContentNPMPackage = fs.readFileSync(__dirname + '/../package.json', 'utf8');
+        const npmPackage = JSON.parse(fileContentNPMPackage);
 
-		expect(ioPackage.common.version, 'ERROR: Version number in io-package.json needs to exist').to.exist;
-		expect(npmPackage.version, 'ERROR: Version number in package.json needs to exist').to.exist;
+        expect(ioPackage).to.be.an('object');
+        expect(npmPackage).to.be.an('object');
 
-		expect(ioPackage.common.version, 'ERROR: Version numbers in package.json and io-package.json needs to match').to.be.equal(npmPackage.version);
+        expect(ioPackage.common.version, 'ERROR: Version number in io-package.json needs to exist').to.exist;
+        expect(npmPackage.version, 'ERROR: Version number in package.json needs to exist').to.exist;
 
-		if (!ioPackage.common.news || !ioPackage.common.news[ioPackage.common.version]) {
-			console.log('WARNING: No news entry for current version exists in io-package.json, no rollback in Admin possible!');
-			console.log();
-		}
+        expect(ioPackage.common.version, 'ERROR: Version numbers in package.json and io-package.json needs to match').to.be.equal(npmPackage.version);
 
-		expect(npmPackage.author, 'ERROR: Author in package.json needs to exist').to.exist;
-		expect(ioPackage.common.authors, 'ERROR: Authors in io-package.json needs to exist').to.exist;
+        if (!ioPackage.common.news || !ioPackage.common.news[ioPackage.common.version]) {
+            console.log('WARNING: No news entry for current version exists in io-package.json, no rollback in Admin possible!');
+            console.log();
+        }
 
-		if (ioPackage.common.name.indexOf('template') !== 0) {
-			if (Array.isArray(ioPackage.common.authors)) {
-				expect(ioPackage.common.authors.length, 'ERROR: Author in io-package.json needs to be set').to.not.be.equal(0);
-				if (ioPackage.common.authors.length === 1) {
-					expect(ioPackage.common.authors[0], 'ERROR: Author in io-package.json needs to be a real name').to.not.be.equal('my Name <my@email.com>');
-				}
-			}
-			else {
-				expect(ioPackage.common.authors, 'ERROR: Author in io-package.json needs to be a real name').to.not.be.equal('my Name <my@email.com>');
-			}
-		}
-		else {
-			console.log('WARNING: Testing for set authors field in io-package skipped because template adapter');
-			console.log();
-		}
-		expect(fs.existsSync(__dirname + '/../README.md'), 'ERROR: README.md needs to exist! Please create one with description, detail information and changelog. English is mandatory.').to.be.true;
-		if (!ioPackage.common.titleLang || typeof ioPackage.common.titleLang !== 'object') {
-			console.log('WARNING: titleLang is not existing in io-package.json. Please add');
-			console.log();
-		}
-		if (
-			ioPackage.common.title.indexOf('iobroker') !== -1 ||
-			ioPackage.common.title.indexOf('ioBroker') !== -1 ||
-			ioPackage.common.title.indexOf('adapter') !== -1 ||
-			ioPackage.common.title.indexOf('Adapter') !== -1
-		) {
-			console.log('WARNING: title contains Adapter or ioBroker. It is clear anyway, that it is adapter for ioBroker.');
-			console.log();
-		}
+        expect(npmPackage.author, 'ERROR: Author in package.json needs to exist').to.exist;
+        expect(ioPackage.common.authors, 'ERROR: Authors in io-package.json needs to exist').to.exist;
 
-		if (ioPackage.common.name.indexOf('vis-') !== 0) {
-			if (!ioPackage.common.materialize || !fs.existsSync(__dirname + '/../admin/index_m.html') || !fs.existsSync(__dirname + '/../gulpfile.js')) {
-				console.log('WARNING: Admin3 support is missing! Please add it');
-				console.log();
-			}
-			if (ioPackage.common.materialize) {
-				expect(fs.existsSync(__dirname + '/../admin/index_m.html'), 'Admin3 support is enabled in io-package.json, but index_m.html is missing!').to.be.true;
-			}
-		}
+        expect(ioPackage.common.license, 'ERROR: License missing in io-package in common.license').to.exist;
 
-		var licenseFileExists = fs.existsSync(__dirname + '/../LICENSE');
-		var fileContentReadme = fs.readFileSync(__dirname + '/../README.md', 'utf8');
-		if (fileContentReadme.indexOf('## Changelog') === -1) {
-			console.log('Warning: The README.md should have a section ## Changelog');
-			console.log();
-		}
-		expect((licenseFileExists || fileContentReadme.indexOf('## License') !== -1), 'A LICENSE must exist as LICENSE file or as part of the README.md').to.be.true;
-		if (!licenseFileExists) {
-			console.log('Warning: The License should also exist as LICENSE file');
-			console.log();
-		}
-		if (fileContentReadme.indexOf('## License') === -1) {
-			console.log('Warning: The README.md should also have a section ## License to be shown in Admin3');
-			console.log();
-		}
-		done();
-	});
-});
\ No newline at end of file
+        if (ioPackage.common.name.indexOf('template') !== 0) {
+            if (Array.isArray(ioPackage.common.authors)) {
+                expect(ioPackage.common.authors.length, 'ERROR: Author in io-package.json needs to be set').to.not.be.equal(0);
+                if (ioPackage.common.authors.length === 1) {
+                    expect(ioPackage.common.authors[0], 'ERROR: Author in io-package.json needs to be a real name').to.not.be.equal('my Name <my@email.com>');
+                }
+            }
+            else {
+                expect(ioPackage.common.authors, 'ERROR: Author in io-package.json needs to be a real name').to.not.be.equal('my Name <my@email.com>');
+            }
+        }
+        else {
+            console.log('WARNING: Testing for set authors field in io-package skipped because template adapter');
+            console.log();
+        }
+        expect(fs.existsSync(__dirname + '/../README.md'), 'ERROR: README.md needs to exist! Please create one with description, detail information and changelog. English is mandatory.').to.be.true;
+        if (!ioPackage.common.titleLang || typeof ioPackage.common.titleLang !== 'object') {
+            console.log('WARNING: titleLang is not existing in io-package.json. Please add');
+            console.log();
+        }
+        if (
+            ioPackage.common.title.indexOf('iobroker') !== -1 ||
+            ioPackage.common.title.indexOf('ioBroker') !== -1 ||
+            ioPackage.common.title.indexOf('adapter') !== -1 ||
+            ioPackage.common.title.indexOf('Adapter') !== -1
+        ) {
+            console.log('WARNING: title contains Adapter or ioBroker. It is clear anyway, that it is adapter for ioBroker.');
+            console.log();
+        }
+
+        if (!ioPackage.common.controller && !ioPackage.common.onlyWWW && !ioPackage.common.noConfig) {
+            if (!ioPackage.common.materialize || !fs.existsSync(__dirname + '/../admin/index_m.html') || !fs.existsSync(__dirname + '/../gulpfile.js')) {
+                console.log('WARNING: Admin3 support is missing! Please add it');
+                console.log();
+            }
+            if (ioPackage.common.materialize) {
+                expect(fs.existsSync(__dirname + '/../admin/index_m.html'), 'Admin3 support is enabled in io-package.json, but index_m.html is missing!').to.be.true;
+            }
+        }
+
+        const licenseFileExists = fs.existsSync(__dirname + '/../LICENSE');
+        const fileContentReadme = fs.readFileSync(__dirname + '/../README.md', 'utf8');
+        if (fileContentReadme.indexOf('## Changelog') === -1) {
+            console.log('Warning: The README.md should have a section ## Changelog');
+            console.log();
+        }
+        expect((licenseFileExists || fileContentReadme.indexOf('## License') !== -1), 'A LICENSE must exist as LICENSE file or as part of the README.md').to.be.true;
+        if (!licenseFileExists) {
+            console.log('Warning: The License should also exist as LICENSE file');
+            console.log();
+        }
+        if (fileContentReadme.indexOf('## License') === -1) {
+            console.log('Warning: The README.md should also have a section ## License to be shown in Admin3');
+            console.log();
+        }
+        done();
+    });
+});