diff --git a/dev/tests/conf/local.conf b/dev/tests/conf/local.conf
index 4cf53fa..ef3b77b 100644
--- a/dev/tests/conf/local.conf
+++ b/dev/tests/conf/local.conf
@@ -2,9 +2,9 @@
 
 ###### obackup - Local or Remote, push or pull backup script for files & mysql databases
 ###### (C) 2013-2016 by Orsiris de Jong (www.netpower.fr)
-###### obackup v2.1x config file rev 2016081701
 
 ###### GENERAL BACKUP OPTIONS
+CONFIG_FILE_REVISION=2.1
 
 ## Backup identification string.
 INSTANCE_ID="local-test"
@@ -13,7 +13,7 @@ INSTANCE_ID="local-test"
 LOGFILE=""
 
 ## Elements to backup
-SQL_BACKUP=yes
+SQL_BACKUP=no
 FILE_BACKUP=yes
 
 ## Backups can be done local, pulled from another server or pushed to a backup server. Available options are [local,pull,push].
@@ -27,7 +27,7 @@ SQL_STORAGE="${HOME}/obackup-storage/sql-local"
 FILE_STORAGE="${HOME}/obackup-storage/files-local"
 
 ## Encryption
-ENCRYPTION=yes
+ENCRYPTION=no
 
 ## Backup encryption needs a temporary storage space in order to encrypt files before sending them (absolute paths of the local or remote system)
 CRYPT_STORAGE="${HOME}/obackup-storage/crypt-local"
@@ -87,9 +87,9 @@ SQL_USER=root
 ## Enabling the following option will save all databases on local or remote given SQL instance except the ones specified in the exclude list.
 ## Every found database will be backed up as separate backup task.
 DATABASES_ALL=yes
-DATABASES_ALL_EXCLUDE_LIST="test;information_schema;zarafa_prod"
+DATABASES_ALL_EXCLUDE_LIST="test;information_schema;kopano_prod"
 ## Alternatively, if DATABASES_ALL=no, you can specify a list of databases to backup separated by spaces.
-DATABASES_LIST="mysql"
+DATABASES_LIST=mysql
 
 ## Max backup execution time per Database task. Soft max exec time generates a warning only. Hard max exec time generates a warning and stops current backup task.
 ## If a task gets stopped, next one in the task list gets executed. Time is specified in seconds.
@@ -112,8 +112,8 @@ COMPRESSION_LEVEL=3
 ## You can exclude directories from the avove backup task creation, ex: avoid backing up "/home/dir2" by adding it to RECURSIVE_EXCLUDE_LIST.
 
 ## Directories backup list. List of semicolon separated directories that will be backed up.
-DIRECTORY_LIST="${HOME}/obackup-testdata/testData"
-RECURSIVE_DIRECTORY_LIST="${HOME}/obackup-testdata/testDataRecursive"
+DIRECTORY_LIST=/root/obackup-testdata/nonPresentData
+RECURSIVE_DIRECTORY_LIST=/root/obackup-testdata/nonPresentDataRecursive
 RECURSIVE_EXCLUDE_LIST="${HOME}/obackup-testdata/testDataRecursive/Excluded"
 
 ## Rsync exclude / include order (the option set here will be set first, eg: include will make include then exclude patterns)
diff --git a/dev/tests/conf/max-exec-time.conf b/dev/tests/conf/max-exec-time.conf
index c56bfda..18c868a 100644
--- a/dev/tests/conf/max-exec-time.conf
+++ b/dev/tests/conf/max-exec-time.conf
@@ -2,9 +2,9 @@
 
 ###### obackup - Local or Remote, push or pull backup script for files & mysql databases
 ###### (C) 2013-2016 by Orsiris de Jong (www.netpower.fr)
-###### obackup v2.1x config file rev 2016081701
 
 ###### GENERAL BACKUP OPTIONS
+CONFIG_FILE_REVISION=2.1
 
 ## Backup identification string.
 INSTANCE_ID="local-test"
diff --git a/dev/tests/conf/pull.conf b/dev/tests/conf/pull.conf
index 4f960b8..727b15a 100644
--- a/dev/tests/conf/pull.conf
+++ b/dev/tests/conf/pull.conf
@@ -2,9 +2,9 @@
 
 ###### obackup - Local or Remote, push or pull backup script for files & mysql databases
 ###### (C) 2013-2016 by Orsiris de Jong (www.netpower.fr)
-###### obackup v2.1x config file rev 2016081701
 
 ###### GENERAL BACKUP OPTIONS
+CONFIG_FILE_REVISION=2.1
 
 ## Backup identification string.
 INSTANCE_ID="pull-test"
@@ -56,7 +56,7 @@ FILE_WARN_MIN_SPACE=1048576
 ###### REMOTE ONLY OPTIONS
 
 ## In case of pulled or pushed backups, remote system URI needs to be supplied.
-REMOTE_SYSTEM_URI="ssh://root@localhost:49999/"
+REMOTE_SYSTEM_URI="ssh://root@localhost:44999./"
 
 ## You can specify a RSA key (please use full path). If not defined, the default ~/.ssh/id_rsa will be used. See documentation for further information.
 SSH_RSA_PRIVATE_KEY="${HOME}/.ssh/id_rsa_local"
@@ -92,7 +92,7 @@ SQL_USER=root
 ## Enabling the following option will save all databases on local or remote given SQL instance except the ones specified in the exclude list.
 ## Every found database will be backed up as separate backup task.
 DATABASES_ALL=yes
-DATABASES_ALL_EXCLUDE_LIST="test;information_schema;zarafa_prod"
+DATABASES_ALL_EXCLUDE_LIST="test;information_schema;kopano_prod"
 ## Alternatively, if DATABASES_ALL=no, you can specify a list of databases to backup separated by spaces.
 DATABASES_LIST=mysql
 
diff --git a/dev/tests/conf/push.conf b/dev/tests/conf/push.conf
index 9a67cba..0cf0663 100644
--- a/dev/tests/conf/push.conf
+++ b/dev/tests/conf/push.conf
@@ -2,9 +2,9 @@
 
 ###### obackup - Local or Remote, push or pull backup script for files & mysql databases
 ###### (C) 2013-2016 by Orsiris de Jong (www.netpower.fr)
-###### obackup v2.1x config file rev 2016081701
 
 ###### GENERAL BACKUP OPTIONS
+CONFIG_FILE_REVISION=2.1
 
 ## Backup identification string.
 INSTANCE_ID="push-test"
@@ -56,7 +56,7 @@ FILE_WARN_MIN_SPACE=1048576
 ###### REMOTE ONLY OPTIONS
 
 ## In case of pulled or pushed backups, remote system URI needs to be supplied.
-REMOTE_SYSTEM_URI="ssh://root@localhost:49999/"
+REMOTE_SYSTEM_URI="ssh://root@localhost:44999./"
 
 ## You can specify a RSA key (please use full path). If not defined, the default ~/.ssh/id_rsa will be used. See documentation for further information.
 SSH_RSA_PRIVATE_KEY="${HOME}/.ssh/id_rsa_local"
@@ -92,7 +92,7 @@ SQL_USER=root
 ## Enabling the following option will save all databases on local or remote given SQL instance except the ones specified in the exclude list.
 ## Every found database will be backed up as separate backup task.
 DATABASES_ALL=yes
-DATABASES_ALL_EXCLUDE_LIST="test;information_schema;zarafa_prod"
+DATABASES_ALL_EXCLUDE_LIST="test;information_schema;kopano_prod"
 ## Alternatively, if DATABASES_ALL=no, you can specify a list of databases to backup separated by spaces.
 DATABASES_LIST=mysql