diff --git a/etc/arangodb3/arango-dfdb.conf.in b/etc/arangodb3/arango-dfdb.conf.in
index bf619cf945..a1790beecc 100644
--- a/etc/arangodb3/arango-dfdb.conf.in
+++ b/etc/arangodb3/arango-dfdb.conf.in
@@ -4,11 +4,13 @@
 auto-upgrade = false
 upgrade-check = false
 directory= @LOCALSTATEDIR@/lib/arangodb3
-# maximal-journal-size=33554432
 
 [server]
 rest-server = false
 authentication = true
+# username = root
+# password = 
+
 statistics = false
 # set number of threads to 1 so we don't have concurrency
 threads = 1
diff --git a/etc/arangodb3/arangobench.conf.in b/etc/arangodb3/arangobench.conf.in
index 5c6dfe0f28..b725cc9e5a 100644
--- a/etc/arangodb3/arangobench.conf.in
+++ b/etc/arangodb3/arangobench.conf.in
@@ -6,3 +6,5 @@ progress = true
 [server]
 endpoint = tcp://127.0.0.1:8529
 authentication = true
+# username = root
+# password = 
diff --git a/etc/arangodb3/arangod.conf.in b/etc/arangodb3/arangod.conf.in
index c910e2e9f8..80f89aa649 100644
--- a/etc/arangodb3/arangod.conf.in
+++ b/etc/arangodb3/arangod.conf.in
@@ -31,36 +31,47 @@ endpoint = tcp://127.0.0.1:8529
 # resuse a port on restart or wait until it is freed by the operating system
 # reuse-address = false
 
-# disable authentication for the admin frontend
 authentication = true
 
-# number of server threads, 0 to use them all
-# threads = 4
+# number of server threads. use 0 to make arangod determine the
+# number of threads automatically, based on available CPUs
+# threads = 0
+
+# gather server statistics
+statistics = true
 
 # the user and group are normally set in the start script
 # uid = arangodb
 # gid = arangodb
 
 [scheduler]
-
-# number of threads used for I/O, 0 will select a sensible number
-# threads = 2
+# number of threads used for I/O, use 0 to make arangod determine
+# the number of threads automatically
+# threads = 0
 
 [javascript]
 startup-directory = @PKGDATADIR@/js
 app-path = @LOCALSTATEDIR@/lib/arangodb3-apps
 # app-path = @HOMEDRIVE@/@HOMEPATH@/arangodb3/apps
 
-# number of worker threads for V8
-v8-contexts = 5
+# number of V8 contexts available for JavaScript execution. use 0 to 
+# make arangod determine the number of contexts automatically.
+# v8-contexts = 0
+
+[foxx]
+# enable Foxx queues in the server
+# queues = true
+
+# interval (seconds) to use for polling jobs in Foxx queues
+# queues-poll-interval = 1
 
 [log]
 level = info
-file = @LOCALSTATEDIR@/log/arangodb/arangod.log
+file = @LOCALSTATEDIR@/log/arangodb3/arangod.log
 
 [cluster]
 data-path = @LOCALSTATEDIR@/lib/arangodb3/cluster
-log-path = @LOCALSTATEDIR@/log/arangodb/cluster
+log-path = @LOCALSTATEDIR@/log/arangodb3/cluster
 arangod-path = @SBINDIR@/arangod@PROGRAM_SUFFIX@
 dbserver-config = @SYSCONFDIR@/arangod.conf
 coordinator-config = @SYSCONFDIR@/arangod.conf
diff --git a/etc/arangodb3/arangodump.conf.in b/etc/arangodb3/arangodump.conf.in
index 8471d691ce..1691d0c5d7 100644
--- a/etc/arangodb3/arangodump.conf.in
+++ b/etc/arangodb3/arangodump.conf.in
@@ -5,3 +5,5 @@ progress = true
 [server]
 endpoint = tcp://127.0.0.1:8529
 authentication = true
+# username = root
+# password = 
diff --git a/etc/arangodb3/arangoimp.conf.in b/etc/arangodb3/arangoimp.conf.in
index d6231f9c00..a1df387b42 100644
--- a/etc/arangodb3/arangoimp.conf.in
+++ b/etc/arangodb3/arangoimp.conf.in
@@ -3,3 +3,5 @@
 [server]
 endpoint = tcp://127.0.0.1:8529
 authentication = true
+# username = root
+# password = 
diff --git a/etc/arangodb3/arangorestore.conf.in b/etc/arangodb3/arangorestore.conf.in
index b3566e8ee8..71659c5c0d 100644
--- a/etc/arangodb3/arangorestore.conf.in
+++ b/etc/arangodb3/arangorestore.conf.in
@@ -5,3 +5,5 @@ progress = true
 [server]
 endpoint = tcp://127.0.0.1:8529
 authentication = true
+# username = root
+# password = 
diff --git a/etc/arangodb3/arangosh.conf.in b/etc/arangodb3/arangosh.conf.in
index 123d7f21a9..c4dfc3d3fc 100644
--- a/etc/arangodb3/arangosh.conf.in
+++ b/etc/arangodb3/arangosh.conf.in
@@ -4,6 +4,8 @@ pretty-print = true
 [server]
 endpoint = tcp://127.0.0.1:8529
 authentication = true
+# username = root
+# password = 
 
 [javascript]
 startup-directory = @PKGDATADIR@/js
diff --git a/etc/arangodb3/foxx-manager.conf.in b/etc/arangodb3/foxx-manager.conf.in
index a6a7c31a49..d14313b9cf 100644
--- a/etc/arangodb3/foxx-manager.conf.in
+++ b/etc/arangodb3/foxx-manager.conf.in
@@ -3,7 +3,9 @@ pretty-print = true
 
 [server]
 endpoint = tcp://127.0.0.1:8529
-authentication = false
+authentication = true
+# username = root
+# password = 
 
 [javascript]
 startup-directory = @PKGDATADIR@/js
diff --git a/etc/relative/arango-dfdb.conf b/etc/relative/arango-dfdb.conf
index 5ac634d033..62c43cf41e 100644
--- a/etc/relative/arango-dfdb.conf
+++ b/etc/relative/arango-dfdb.conf
@@ -5,6 +5,9 @@ upgrade-check = false
 [server]
 rest-server = false
 authentication = false
+# username = root
+# password =
+
 statistics = false
 # set number of threads to 1 so we don't have concurrency
 threads = 1
diff --git a/etc/relative/arangobench.conf b/etc/relative/arangobench.conf
index 54be5f1503..68177edfa4 100644
--- a/etc/relative/arangobench.conf
+++ b/etc/relative/arangobench.conf
@@ -3,4 +3,5 @@ progress = true
 
 [server]
 authentication = false
-
+# username = root
+# password =
diff --git a/etc/relative/arangod-coordinator.conf b/etc/relative/arangod-coordinator.conf
deleted file mode 100644
index 99816b84a8..0000000000
--- a/etc/relative/arangod-coordinator.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-[database]
-# directory= /var/arangodb
-# maximal-journal-size = 33554432
-
-[server]
-disable-authentication = true
-endpoint = tcp://127.0.0.1:8529
-threads = 10
-keyfile = UnitTests/server.pem
-# reuse-address = false
-
-[scheduler]
-threads = 2
-
-[javascript]
-startup-directory = ./js
-app-path = ./js/apps
-v8-contexts = 5
-
-[log]
-level = info
-
-[cluster]
-username = root
-password =
-
-data-path = ./cluster/data
-log-path = ./cluster/log
-arangod-path = ./bin/arangod
-dbserver-config = ./etc/relative/arangod-dbserver.conf
-coordinator-config = ./etc/relative/arangod-coordinator.conf
diff --git a/etc/relative/arangod-dbserver.conf b/etc/relative/arangod-dbserver.conf
deleted file mode 100644
index 99816b84a8..0000000000
--- a/etc/relative/arangod-dbserver.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-[database]
-# directory= /var/arangodb
-# maximal-journal-size = 33554432
-
-[server]
-disable-authentication = true
-endpoint = tcp://127.0.0.1:8529
-threads = 10
-keyfile = UnitTests/server.pem
-# reuse-address = false
-
-[scheduler]
-threads = 2
-
-[javascript]
-startup-directory = ./js
-app-path = ./js/apps
-v8-contexts = 5
-
-[log]
-level = info
-
-[cluster]
-username = root
-password =
-
-data-path = ./cluster/data
-log-path = ./cluster/log
-arangod-path = ./bin/arangod
-dbserver-config = ./etc/relative/arangod-dbserver.conf
-coordinator-config = ./etc/relative/arangod-coordinator.conf
diff --git a/etc/relative/arangod.conf b/etc/relative/arangod.conf
index 449a2dc25f..756f1faf7b 100644
--- a/etc/relative/arangod.conf
+++ b/etc/relative/arangod.conf
@@ -1,6 +1,8 @@
 [server]
 authentication = true
 endpoint = tcp://0.0.0.0:8529
+# username = root
+# password =
 
 [javascript]
 startup-directory = ./js
diff --git a/etc/relative/arangodump.conf b/etc/relative/arangodump.conf
index a28bf966b5..84b7e14c2f 100644
--- a/etc/relative/arangodump.conf
+++ b/etc/relative/arangodump.conf
@@ -2,4 +2,5 @@ progress = true
 
 [server]
 authentication = false
-
+# username = root
+# password =
diff --git a/etc/relative/arangoimp.conf b/etc/relative/arangoimp.conf
index d02ba05af3..a59eed577b 100644
--- a/etc/relative/arangoimp.conf
+++ b/etc/relative/arangoimp.conf
@@ -1,3 +1,4 @@
 [server]
 authentication = false
-
+# username = root
+# password =
diff --git a/etc/relative/arangorestore.conf b/etc/relative/arangorestore.conf
index a28bf966b5..84b7e14c2f 100644
--- a/etc/relative/arangorestore.conf
+++ b/etc/relative/arangorestore.conf
@@ -2,4 +2,5 @@ progress = true
 
 [server]
 authentication = false
-
+# username = root
+# password =
diff --git a/etc/relative/arangosh.conf b/etc/relative/arangosh.conf
index 596da4dab4..5c832356c0 100644
--- a/etc/relative/arangosh.conf
+++ b/etc/relative/arangosh.conf
@@ -3,6 +3,8 @@ pretty-print = true
 
 [server]
 authentication = false
+# username = root
+# password =
 
 [javascript]
 startup-directory = ./js
diff --git a/etc/relative/foxx-manager.conf b/etc/relative/foxx-manager.conf
index e78e224dc8..4ecd80e897 100644
--- a/etc/relative/foxx-manager.conf
+++ b/etc/relative/foxx-manager.conf
@@ -3,6 +3,8 @@ pretty-print = true
 
 [server]
 authentication = false
+# username = root
+# password =
 
 [javascript]
 startup-directory = ./js
diff --git a/js/server/tests/aql/aql-general-graph.js b/js/server/tests/aql/aql-general-graph.js
index 3ecc6871c6..d4b10011fc 100644
--- a/js/server/tests/aql/aql-general-graph.js
+++ b/js/server/tests/aql/aql-general-graph.js
@@ -65,7 +65,7 @@ function ahuacatlQueryGeneralEdgesTestSuite() {
         (FOR x IN ${v4} RETURN x)
       )`;
 
-  var startExample = [{hugo : true}, {heinz : 1}];
+  // var startExample = [{hugo : true}, {heinz : 1}];
 
   return {