diff --git a/src/test/apps-test.js b/src/test/apps-test.js
index b1938c37c..5cb5ca07a 100644
--- a/src/test/apps-test.js
+++ b/src/test/apps-test.js
@@ -12,7 +12,7 @@ var appdb = require('../appdb.js'),
     config = require('../config.js'),
     constants = require('../constants.js'),
     database = require('../database.js'),
-    domaindb = require('../domaindb.js'),
+    domains = require('../domains.js'),
     expect = require('expect.js'),
     groupdb = require('../groupdb.js'),
     groups = require('../groups.js'),
@@ -140,8 +140,8 @@ describe('Apps', function () {
         async.series([
             database.initialize,
             database._clear,
-            // DOMAIN_0 already added for test through domaindb.addDefaultDomain()
-            domaindb.add.bind(null, DOMAIN_1.domain, { zoneName: DOMAIN_1.zoneName, provider: DOMAIN_1.provider, config: DOMAIN_1.config }),
+            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, null),
+            domains.add.bind(null, DOMAIN_1.domain, DOMAIN_1.zoneName, DOMAIN_1.provider, DOMAIN_1.config, null),
             userdb.add.bind(null, ADMIN_0.id, ADMIN_0),
             userdb.add.bind(null, USER_0.id, USER_0),
             userdb.add.bind(null, USER_1.id, USER_1),
diff --git a/src/test/apptask-test.js b/src/test/apptask-test.js
index 953554db9..b2088d548 100644
--- a/src/test/apptask-test.js
+++ b/src/test/apptask-test.js
@@ -104,7 +104,7 @@ describe('apptask', function () {
         async.series([
             database.initialize,
             database._clear,
-            domains.update.bind(null, DOMAIN_0.domain, DOMAIN_0.provider, DOMAIN_0.config, null),
+            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, null),
             appdb.add.bind(null, APP.id, APP.appStoreId, APP.manifest, APP.location, APP.domain, APP.portBindings, APP),
             settings.initialize,
             settings.setTlsConfig.bind(null, { provider: 'caas' })
diff --git a/src/test/digest-test.js b/src/test/digest-test.js
index 1d2a4ec54..e7f81cede 100644
--- a/src/test/digest-test.js
+++ b/src/test/digest-test.js
@@ -13,6 +13,8 @@ var async = require('async'),
     expect = require('expect.js'),
     maildb = require('../maildb.js'),
     mailer = require('../mailer.js'),
+    mail = require('../mail.js'),
+    domains = require('../domains.js'),
     paths = require('../paths.js'),
     safe = require('safetydance'),
     settings = require('../settings.js'),
@@ -32,7 +34,9 @@ var USER_0 = {
 const DOMAIN_0 = {
     domain: 'example.com',
     zoneName: 'example.com',
-    config: { provider: 'manual' }
+    config: {},
+    provider: 'manual',
+    fallbackCertificate: null
 };
 
 var AUDIT_SOURCE = {
@@ -66,6 +70,8 @@ describe('digest', function () {
             database.initialize,
             database._clear,
             settings.initialize,
+            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
+            mail.add.bind(null, DOMAIN_0.domain),
             user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE),
             function (callback) {
                 userdb.getByUsername(USER_0.username, function (error, result) {
diff --git a/src/test/dns-test.js b/src/test/dns-test.js
index f260c9d3d..4ffb22eff 100644
--- a/src/test/dns-test.js
+++ b/src/test/dns-test.js
@@ -20,8 +20,9 @@ var async = require('async'),
 var DOMAIN_0 = {
     domain: 'example-dns-test.com',
     zoneName: 'example-dns-test.com',
-    provider: 'manual',
-    config: {}
+    provider: 'noop',
+    config: {},
+    fallbackCertificate: null
 };
 
 describe('dns provider', function () {
@@ -32,7 +33,8 @@ describe('dns provider', function () {
         async.series([
             database.initialize,
             settings.initialize,
-            database._clear
+            database._clear,
+            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate)
         ], done);
     });
 
diff --git a/src/test/ldap-test.js b/src/test/ldap-test.js
index bccc02971..65e6f292f 100644
--- a/src/test/ldap-test.js
+++ b/src/test/ldap-test.js
@@ -10,6 +10,7 @@ var appdb = require('../appdb.js'),
     assert = require('assert'),
     async = require('async'),
     database = require('../database.js'),
+    domains = require('../domains.js'),
     config = require('../config.js'),
     EventEmitter = require('events').EventEmitter,
     expect = require('expect.js'),
@@ -21,13 +22,19 @@ var appdb = require('../appdb.js'),
     ldap = require('ldapjs'),
     user = require('../user.js');
 
-const DOMAIN = 'example.com';
+const DOMAIN_0 = {
+    domain: 'example.com',
+    zoneName: 'example.com',
+    config: {},
+    provider: 'manual',
+    fallbackCertificate: null
+};
 
 // owner
 var USER_0 = {
     username: 'userName0',
     password: 'Username0pass?1234',
-    email: 'user0@' + DOMAIN.toUpperCase(),
+    email: 'user0@' + DOMAIN_0.domain.toUpperCase(),
     displayName: 'User 0'
 };
 
@@ -37,13 +44,13 @@ var USER_0_ALIAS = 'Asterix';
 var USER_1 = {
     username: 'Username1',
     password: 'Username1pass?12345',
-    email: 'USER1@' + DOMAIN,
+    email: 'USER1@' + DOMAIN_0.domain,
     displayName: 'User 1'
 };
 var USER_2 = {
     username: 'Username2',
     password: 'Username2pass?12345',
-    email: 'USER2@' + DOMAIN,
+    email: 'USER2@' + DOMAIN_0.domain,
     displayName: 'User 2'
 };
 
@@ -61,7 +68,7 @@ var APP_0 = {
     installationProgress: null,
     runState: appdb.RSTATE_RUNNING,
     location: 'some-location-0',
-    domain: DOMAIN,
+    domain: DOMAIN_0.domain,
     manifest: { version: '0.1', dockerImage: 'docker/app0', healthCheckPath: '/', httpPort: 80, title: 'app0' },
     httpPort: null,
     containerId: 'someContainerId',
@@ -84,12 +91,12 @@ function startDockerProxy(interceptor, callback) {
 
 function setup(done) {
     config._reset();
-    config.set('fqdn', DOMAIN);
 
     async.series([
         database.initialize.bind(null),
         database._clear.bind(null),
         ldapServer.start.bind(null),
+        domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
         appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.domain, APP_0.portBindings, APP_0),
         appdb.update.bind(null, APP_0.id, { containerId: APP_0.containerId }),
         appdb.setAddonConfig.bind(null, APP_0.id, 'sendmail', [{ name: 'MAIL_SMTP_PASSWORD', value : 'sendmailpassword' }]),
@@ -134,7 +141,6 @@ function setup(done) {
         },
         function (callback) {
             async.series([
-                user.setAliases.bind(null, USER_0.id, [ USER_0_ALIAS, 'obelix' ]),
                 groups.addMember.bind(null, GROUP_ID, USER_0.id),
                 groups.addMember.bind(null, GROUP_ID, USER_1.id)
             ], callback);
diff --git a/src/test/updatechecker-test.js b/src/test/updatechecker-test.js
index 36f970e87..dbdd0c360 100644
--- a/src/test/updatechecker-test.js
+++ b/src/test/updatechecker-test.js
@@ -10,7 +10,9 @@ var appdb = require('../appdb.js'),
     config = require('../config.js'),
     constants = require('../constants.js'),
     database = require('../database.js'),
+    domains = require('../domains.js'),
     expect = require('expect.js'),
+    mail = require('../mail.js'),
     mailer = require('../mailer.js'),
     nock = require('nock'),
     paths = require('../paths.js'),
@@ -31,7 +33,9 @@ var USER_0 = {
 const DOMAIN_0 = {
     domain: 'example.com',
     zoneName: 'example.com',
-    config: { provider: 'manual' }
+    config: {},
+    provider: 'manual',
+    fallbackCertificate: null
 };
 
 var AUDIT_SOURCE = {
@@ -70,6 +74,8 @@ describe('updatechecker - box - manual (email)', function () {
             database.initialize,
             database._clear,
             settings.initialize,
+            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
+            mail.add.bind(null, DOMAIN_0.domain),
             user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE),
             settings.setAutoupdatePattern.bind(null, constants.AUTOUPDATE_PATTERN_NEVER),
             settingsdb.set.bind(null, settings.APPSTORE_CONFIG_KEY, JSON.stringify({ userId: 'uid', cloudronId: 'cid', token: 'token' })),
@@ -170,6 +176,8 @@ describe('updatechecker - box - automatic (no email)', function () {
         async.series([
             database.initialize,
             settings.initialize,
+            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
+            mail.add.bind(null, DOMAIN_0.domain),
             mailer._clearMailQueue,
             user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE),
             settingsdb.set.bind(null, settings.APPSTORE_CONFIG_KEY, JSON.stringify({ userId: 'uid', cloudronId: 'cid', token: 'token' }))
@@ -212,6 +220,8 @@ describe('updatechecker - box - automatic free (email)', function () {
         async.series([
             database.initialize,
             settings.initialize,
+            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
+            mail.add.bind(null, DOMAIN_0.domain),
             mailer._clearMailQueue,
             user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE),
             settingsdb.set.bind(null, settings.APPSTORE_CONFIG_KEY, JSON.stringify({ userId: 'uid', cloudronId: 'cid', token: 'token' }))
@@ -280,6 +290,8 @@ describe('updatechecker - app - manual (email)', function () {
             database.initialize,
             database._clear,
             settings.initialize,
+            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
+            mail.add.bind(null, DOMAIN_0.domain),
             mailer._clearMailQueue,
             appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.domain, APP_0.portBindings, APP_0),
             user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE),
@@ -394,6 +406,8 @@ describe('updatechecker - app - automatic (no email)', function () {
             database.initialize,
             database._clear,
             settings.initialize,
+            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
+            mail.add.bind(null, DOMAIN_0.domain),
             mailer._clearMailQueue,
             appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.domain, APP_0.portBindings, APP_0),
             user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE),
@@ -457,6 +471,8 @@ describe('updatechecker - app - automatic free (email)', function () {
             database.initialize,
             database._clear,
             settings.initialize,
+            domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, DOMAIN_0.fallbackCertificate),
+            mail.add.bind(null, DOMAIN_0.domain),
             mailer._clearMailQueue,
             appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.domain, APP_0.portBindings, APP_0),
             user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, AUDIT_SOURCE),