merge settingsdb into settings code

src/test/common.js

@@ -15,7 +15,6 @@ const appdb = require('../appdb.js'),
     path = require('path'),
     rimraf = require('rimraf'),
     settings = require('../settings.js'),
-    settingsdb = require('../settingsdb.js'),
     tasks = require('../tasks.js'),
     users = require('../users.js');
 
@@ -185,7 +184,7 @@ function setup(done) {
             admin.id = result;
         },
         appdb.add.bind(null, app.id, app.appStoreId, app.manifest, app.location, app.domain, app.portBindings, app),
-        settingsdb.set.bind(null, settings.CLOUDRON_TOKEN_KEY, exports.appstoreToken), // appstore token
+        settings._set.bind(null, settings.CLOUDRON_TOKEN_KEY, exports.appstoreToken), // appstore token
         async function createUser() {
             const result = await users.add(user.email, user, auditSource);
             user.id = result;