diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..9ae0879d2fe8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+# test coverage
+tests/clover.xml
diff --git a/.travis.yml b/.travis.yml
index 82390afda434..1fc847f26ea7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,13 +3,7 @@ language: php
 
 # list any PHP version you want to test against
 php:
-  # using major version aliases
-
-  # aliased to a recent 5.3.x version
-  - 5.3
-  # aliased to a recent 5.4.x version
   - 5.4
-  # aliased to a recent 5.5.x version
   - 5.5
   # aliased to a recent 5.5.x version
   - 5.6
@@ -21,18 +15,22 @@ php:
 #  - DB=mysql
 #  - DB=pgsql
 
-# execute any number of scripts before the test run, custom env's are available as variables
-#before_script:
-#  - if [[ "$DB" == "pgsql" ]]; then psql -c "DROP DATABASE IF EXISTS hello_world_test;" -U postgres; fi
-#  - if [[ "$DB" == "pgsql" ]]; then psql -c "create database hello_world_test;" -U postgres; fi
-#  - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS hello_world_test;" -uroot; fi
+env:
+  matrix:
+    - DB=sqlite
+
+before_install:
+  - wget https://github.com/raw/owncloud/administration/master/travis-ci/before_install.sh
+  - bash ./before_install.sh firstrunwizard master $DB
+  - cd ../core
+  - php occ app:enable firstrunwizard
 
-# omitting "script:" will default to phpunit
-# use the $DB env variable to determine the phpunit.xml to use
-#script: phpunit --configuration phpunit_$DB.xml --coverage-text
-script: ant test
+before_script:
+  - cd apps/firstrunwizard
 
-# configure notifications (email, IRC, campfire etc)
-#notifications:
-#  irc: "irc.freenode.org#travis"
+script:
+  - cd tests
+  - phpunit --configuration phpunit.xml
 
+allow_failures:
+  - php: hhvm
diff --git a/ajax/disable.php b/ajax/disable.php
index f25b65eee929..abb021176bcd 100644
--- a/ajax/disable.php
+++ b/ajax/disable.php
@@ -1,30 +1,34 @@
 <?php
-
 /**
-* ownCloud - firstrunwizard application
-*
-* @author Frank Karlitschek
-* @copyright 2012 Frank Karlitschek frank@owncloud.org
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
+ * ownCloud - firstrunwizard application
+ *
+ * @author Frank Karlitschek
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\FirstRunWizard;
 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('firstrunwizard');
-OCP\JSON::callCheck();
+use OCP\JSON;
 
-\OCA_FirstRunWizard\Config::disable();
+JSON::checkLoggedIn();
+JSON::checkAppEnabled('firstrunwizard');
+JSON::callCheck();
 
+$config = \OC::$server->getConfig();
+$userSession = \OC::$server->getUserSession();
+$firstRunConfig = new Config($config, $userSession);
 
+$firstRunConfig->disable();
diff --git a/ajax/enable.php b/ajax/enable.php
index 8fb749b477ee..903627136f24 100644
--- a/ajax/enable.php
+++ b/ajax/enable.php
@@ -1,30 +1,34 @@
 <?php
-
 /**
-* ownCloud - firstrunwizard application
-*
-* @author Frank Karlitschek
-* @copyright 2012 Frank Karlitschek frank@owncloud.org
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
+ * ownCloud - firstrunwizard application
+ *
+ * @author Frank Karlitschek
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\FirstRunWizard;
 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('firstrunwizard');
-OCP\JSON::callCheck();
+use OCP\JSON;
 
-\OCA_FirstRunWizard\Config::enable();
+JSON::checkLoggedIn();
+JSON::checkAppEnabled('firstrunwizard');
+JSON::callCheck();
 
+$config = \OC::$server->getConfig();
+$userSession = \OC::$server->getUserSession();
+$firstRunConfig = new Config($config, $userSession);
 
+$firstRunConfig->enable();
diff --git a/appinfo/app.php b/appinfo/app.php
index 7a1e36f1d709..8286f85619f2 100755
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * ownCloud - firstrunwizard App
  *
@@ -20,16 +19,20 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
+namespace OCA\FirstRunWizard;
 
+use OCP\Util;
 
-OC::$CLASSPATH['OCA_FirstRunWizard\Config'] = 'firstrunwizard/lib/firstrunwizard.php';
+Util::addStyle('firstrunwizard', 'colorbox');
+Util::addScript('firstrunwizard', 'jquery.colorbox');
+Util::addScript('firstrunwizard', 'firstrunwizard');
 
-OCP\Util::addStyle( 'firstrunwizard', 'colorbox');
-OCP\Util::addScript( 'firstrunwizard', 'jquery.colorbox');
-OCP\Util::addScript( 'firstrunwizard', 'firstrunwizard');
+Util::addStyle('firstrunwizard', 'firstrunwizard');
 
-OCP\Util::addStyle('firstrunwizard', 'firstrunwizard');
+$config = \OC::$server->getConfig();
+$userSession = \OC::$server->getUserSession();
+$firstRunConfig = new Config($config, $userSession);
 
-if(\OCP\User::isLoggedIn() and \OCA_FirstRunWizard\Config::isenabled()){
-	OCP\Util::addScript( 'firstrunwizard', 'activate');
+if ($userSession->isLoggedIn() && $firstRunConfig->isEnabled()) {
+	Util::addScript( 'firstrunwizard', 'activate');
 }
diff --git a/lib/config.php b/lib/config.php
new file mode 100755
index 000000000000..e04089104bfa
--- /dev/null
+++ b/lib/config.php
@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * ownCloud - firstrunwizard App
+ *
+ * @author Frank Karlitschek
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\FirstRunWizard;
+
+use OCP\IConfig;
+use OCP\IUserSession;
+
+class Config {
+
+	protected $config;
+
+	protected $userSession;
+
+	/**
+	 * @param IConfig $config
+	 * @param IUserSession $userSession
+	 */
+	public function __construct(IConfig $config, IUserSession $userSession) {
+		$this->config = $config;
+		$this->userSession = $userSession;
+	}
+
+	/**
+	* @brief Disable the FirstRunWizard
+	*/
+	public function enable() {
+		$user = $this->userSession->getUser();
+		if ($user) {
+			$this->config->setUserValue($user->getUID(), 'firstrunwizard', 'show', 1);
+		}
+	}
+
+	/**
+	* @brief Enable the FirstRunWizard
+	*/
+	public function disable() {
+		$user = $this->userSession->getUser();
+		if ($user) {
+			$this->config->setUserValue($user->getUID(), 'firstrunwizard', 'show', 0);
+		}
+	}
+
+	/**
+	* @brief Check if the FirstRunWizard is enabled or not
+	* @return bool
+	*/
+	public function isEnabled() {
+		$user = $this->userSession->getUser();
+		if ($user) {
+			$conf = $this->config->getUserValue($user->getUID(), 'firstrunwizard', 'show', 1);
+			return (intval($conf) === 1);
+		} else {
+			return false;
+		}
+	}
+}
diff --git a/lib/firstrunwizard.php b/lib/firstrunwizard.php
deleted file mode 100755
index 24a4f60e3e61..000000000000
--- a/lib/firstrunwizard.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * ownCloud - firstrunwizard App
- *
- * @author Frank Karlitschek
- * @copyright 2012 Frank Karlitschek frank@owncloud.org
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either 
- * version 3 of the License, or any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *  
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- * 
- */
-
-
-namespace OCA_FirstRunWizard;
-
-class Config {
-
-	/**
-	* @brief Disable the FirstRunWizard
-	*/
-	public static function enable() {
-		\OCP\Config::setUserValue( \OCP\User::getUser(), 'firstrunwizard', 'show', 1 );
-	}
-	
-	/**
-	* @brief Enable the FirstRunWizard
-	*/
-	public static function disable() {
-		\OCP\Config::setUserValue( \OCP\User::getUser(), 'firstrunwizard', 'show', 0 );
-	}
-
-	/**
-	* @brief Check if the FirstRunWizard is enabled or not
-	* @return bool
-	*/
-	public static function isenabled() {
-		$conf=\OCP\CONFIG::getUserValue( \OCP\User::getUser() , 'firstrunwizard' , 'show' , 1 );
-		if($conf==1) {
-			return(true);
-		}else{
-			return(false);
-		}
-	}
-
-
-
-}
diff --git a/lib/util.php b/lib/util.php
new file mode 100644
index 000000000000..5f10c0ee569e
--- /dev/null
+++ b/lib/util.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * ownCloud - firstrunwizard App
+ *
+ * @author Georg Ehrke
+ * @copyright 2015 Georg Ehrke georg@ownCloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\FirstRunWizard;
+
+use OCP\App\IAppManager;
+use OCP\Defaults;
+use OCP\IConfig;
+
+class Util {
+
+	protected $appManager;
+
+	protected $config;
+
+	protected $defaults;
+
+	/**
+	 * @param IAppManager $appManager
+	 * @param IConfig $config
+	 * @param Defaults $defaults
+	 */
+	public function __construct(IAppManager $appManager, IConfig $config, Defaults $defaults) {
+		$this->appManager = $appManager;
+		$this->config = $config;
+		$this->defaults = $defaults;
+	}
+
+	/**
+	 * mimic \OC_Util::getEditionString()
+	 * @return string
+	 */
+	public function getEdition() {
+		if ($this->appManager->isEnabledForUser('enterprise_key')) {
+			return 'Enterprise';
+		}
+		return '';
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getSyncClientUrls() {
+		return array(
+			'desktop' => $this->config->getSystemValue('customclient_desktop', $this->defaults->getSyncClientUrl()),
+			'android' => $this->config->getSystemValue('customclient_android', $this->defaults->getAndroidClientUrl()),
+			'ios'     => $this->config->getSystemValue('customclient_ios', $this->defaults->getiOSClientUrl())
+		);
+	}
+}
\ No newline at end of file
diff --git a/templates/wizard.php b/templates/wizard.php
index df5122ef52fd..b5d51e2a9198 100644
--- a/templates/wizard.php
+++ b/templates/wizard.php
@@ -4,7 +4,7 @@
 	<img class="svg" src="<?php print_unescaped(OCP\Util::imagePath('core', 'actions/close.svg')); ?>">
 </a>
 <h1><?php p($l->t('Welcome to %s', array($theme->getTitle()))); ?></h1>
-<?php if (OC_Util::getEditionString() === ''): ?>
+<?php if ($_['edition'] === ''): ?>
 <p><?php p($l->t('Your personal web services. All your files, contacts, calendar and more, in one place.'));?></p>
 <?php else: ?>
 <p><?php p($theme->getSlogan()); ?></p>
@@ -25,7 +25,7 @@
 		alt="<?php p($l->t('iOS app'));?>" />
 </a>
 
-<?php if (OC_Util::getEditionString() === ''): ?>
+<?php if ($_['edition'] === ''): ?>
 <h2><?php p($l->t('Connect your desktop apps to %s', array($theme->getName()))); ?></h2>
 <a target="_blank" class="button" href="<?php p(link_to_docs('user-sync-calendars')) ?>">
 	<img class="appsmall appsmall-calendar svg" alt=""
@@ -53,7 +53,7 @@
 <?php endif; ?>
 
 <p class="footnote">
-<?php if (OC_Util::getEditionString() === ''): ?>
+<?php if ($_['edition'] === ''): ?>
 <?php print_unescaped($l->t('There’s more information in the <a target="_blank" href="%s">documentation</a> and on our <a target="_blank" href="http://owncloud.org">website</a>.', array(link_to_docs('user_manual')))); ?><br>
 <?php print_unescaped($l->t('If you like ownCloud,
 	<a href="mailto:?subject=ownCloud
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 000000000000..b7f9915b055f
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,14 @@
+<?php
+
+global $RUNTIME_NOAPPS;
+$RUNTIME_NOAPPS = true;
+
+define('PHPUNIT_RUN', 1);
+
+require_once __DIR__.'/../../../lib/base.php';
+
+if(!class_exists('PHPUnit_Framework_TestCase')) {
+	require_once('PHPUnit/Autoload.php');
+}
+
+OC_Hook::clear();
diff --git a/tests/lib/configtest.php b/tests/lib/configtest.php
new file mode 100644
index 000000000000..6cfa4a12e787
--- /dev/null
+++ b/tests/lib/configtest.php
@@ -0,0 +1,160 @@
+<?php
+
+namespace OCA\FirstRunWizard\Tests;
+
+use OCA\FirstRunWizard\Config;
+
+class ConfigTest extends \PHPUnit_Framework_TestCase {
+
+	/**
+	 * @dataProvider enableDisableData
+	 */
+	public function testEnable($isUserAvailable) {
+		$config = $this->getMockBuilder('\OCP\IConfig')
+			->disableOriginalConstructor()->getMock();
+		$userSession = $this->getMockBuilder('\OCP\IUserSession')
+			->disableOriginalConstructor()->getMock();
+		$user = $this->getMockBuilder('\OCP\IUser')
+			->disableOriginalConstructor()->getMock();
+
+		if ($isUserAvailable) {
+			$user->expects($this->once())
+				->method('getUID')
+				->will($this->returnValue('user123'));
+
+			$userSession->expects($this->once())
+				->method('getUser')
+				->will($this->returnValue($user));
+
+			$config->expects($this->once())
+				->method('setUserValue')
+				->with('user123', 'firstrunwizard', 'show', 1);
+
+			$c = new Config($config, $userSession);
+			$c->enable();
+		} else {
+			$userSession->expects($this->once())
+				->method('getUser')
+				->will($this->returnValue(null));
+			$user->expects($this->never())
+				->method('getUID');
+			$config->expects($this->never())
+				->method('setUserValue');
+
+			$c = new Config($config, $userSession);
+			$c->enable();
+		}
+	}
+
+	/**
+	 * @dataProvider enableDisableData
+	 */
+	public function testDisable($isUserAvailable) {
+		$config = $this->getMockBuilder('\OCP\IConfig')
+			->disableOriginalConstructor()->getMock();
+		$userSession = $this->getMockBuilder('\OCP\IUserSession')
+			->disableOriginalConstructor()->getMock();
+		$user = $this->getMockBuilder('\OCP\IUser')
+			->disableOriginalConstructor()->getMock();
+
+		if ($isUserAvailable) {
+			$user->expects($this->once())
+				->method('getUID')
+				->will($this->returnValue('user123'));
+
+			$userSession->expects($this->once())
+				->method('getUser')
+				->will($this->returnValue($user));
+
+			$config->expects($this->once())
+				->method('setUserValue')
+				->with('user123', 'firstrunwizard', 'show', 0);
+
+			$c = new Config($config, $userSession);
+			$c->disable();
+		} else {
+			$userSession->expects($this->once())
+				->method('getUser')
+				->will($this->returnValue(null));
+			$user->expects($this->never())
+				->method('getUID');
+			$config->expects($this->never())
+				->method('setUserValue');
+
+			$c = new Config($config, $userSession);
+			$c->disable();
+		}
+	}
+
+	public function enableDisableData() {
+		return [
+			[true],
+			[false],
+		];
+	}
+
+	/**
+	 * @dataProvider isEnabledData
+	 */
+	public function testIsEnabled($isEnabled) {
+		$config = $this->getMockBuilder('\OCP\IConfig')
+			->disableOriginalConstructor()->getMock();
+		$userSession = $this->getMockBuilder('\OCP\IUserSession')
+			->disableOriginalConstructor()->getMock();
+		$user = $this->getMockBuilder('\OCP\IUser')
+			->disableOriginalConstructor()->getMock();
+
+		if ($isEnabled === true) {
+			$user->expects($this->once())
+				->method('getUID')
+				->will($this->returnValue('user123'));
+
+			$userSession->expects($this->once())
+				->method('getUser')
+				->will($this->returnValue($user));
+
+			$config->expects($this->once())
+				->method('getUserValue')
+				->with('user123', 'firstrunwizard', 'show', 1)
+				->will($this->returnValue(1));
+
+			$c = new Config($config, $userSession);
+			$this->assertEquals(true, $c->isEnabled());
+		} elseif ($isEnabled === false) {
+			$user->expects($this->once())
+				->method('getUID')
+				->will($this->returnValue('user123'));
+
+			$userSession->expects($this->once())
+				->method('getUser')
+				->will($this->returnValue($user));
+
+			$config->expects($this->once())
+				->method('getUserValue')
+				->with('user123', 'firstrunwizard', 'show', 1)
+				->will($this->returnValue(0));
+
+			$c = new Config($config, $userSession);
+			$this->assertEquals(false, $c->isEnabled());
+		} elseif ($isEnabled === null) {
+			$userSession->expects($this->once())
+				->method('getUser')
+				->will($this->returnValue(null));
+			$user->expects($this->never())
+				->method('getUID');
+			$config->expects($this->never())
+				->method('getUserValue');
+
+			$c = new Config($config, $userSession);
+			$this->assertEquals(false, $c->isEnabled());
+		}
+	}
+
+	public function isEnabledData() {
+		return [
+			[true],
+			[false],
+			[null],
+		];
+	}
+}
\ No newline at end of file
diff --git a/tests/lib/utiltest.php b/tests/lib/utiltest.php
new file mode 100644
index 000000000000..631855a354bd
--- /dev/null
+++ b/tests/lib/utiltest.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace OCA\FirstRunWizard\Tests;
+
+use OCA\FirstRunWizard\Util;
+
+class UtilTest extends \PHPUnit_Framework_TestCase {
+
+	/**
+	 * @dataProvider getEditionData
+	 */
+	public function testGetEdition($isEnterpriseKeyEnabled, $string) {
+		$appManager = $this->getMockBuilder('\OCP\App\IAppManager')
+			->disableOriginalConstructor()->getMock();
+		$config = $this->getMockBuilder('\OCP\IConfig')
+			->disableOriginalConstructor()->getMock();
+		$defaults = $this->getMockBuilder('\OCP\Defaults')
+			->disableOriginalConstructor()->getMock();
+
+		$appManager->expects($this->once())
+			->method('isEnabledForUser')
+			->with('enterprise_key')
+			->will($this->returnValue($isEnterpriseKeyEnabled));
+
+		$util = new Util($appManager, $config, $defaults);
+		$this->assertEquals($string, $util->getEdition());
+	}
+
+	public function getEditionData() {
+		return [
+			[true, 'Enterprise'],
+			[false, ''],
+		];
+	}
+
+	/**
+	 * @dataProvider getSyncClientUrlsData
+	 */
+	public function testGetSyncClientUrls($configValues, $defaultValues) {
+		$appManager = $this->getMockBuilder('\OCP\App\IAppManager')
+			->disableOriginalConstructor()->getMock();
+		$config = $this->getMockBuilder('\OCP\IConfig')
+			->disableOriginalConstructor()->getMock();
+		$defaults = $this->getMockBuilder('\OCP\Defaults')
+			->disableOriginalConstructor()->getMock();
+
+		$defaults->expects($this->once())
+			->method('getSyncClientUrl')
+			->will($this->returnValue($defaultValues[0]));
+		$defaults->expects($this->once())
+			->method('getAndroidClientUrl')
+			->will($this->returnValue($defaultValues[1]));
+		$defaults->expects($this->once())
+			->method('getiOSClientUrl')
+			->will($this->returnValue($defaultValues[2]));
+
+		$config->expects($this->at(0))
+			->method('getSystemValue')
+			->with('customclient_desktop', $defaultValues[0])
+			->will($this->returnValue($configValues[0]));
+		$config->expects($this->at(1))
+			->method('getSystemValue')
+			->with('customclient_android', $defaultValues[1])
+			->will($this->returnValue($configValues[1]));
+		$config->expects($this->at(2))
+			->method('getSystemValue')
+			->with('customclient_ios', $defaultValues[2])
+			->will($this->returnValue($configValues[2]));
+
+		$util = new Util($appManager, $config, $defaults);
+		$this->assertEquals([
+			'desktop' => $configValues[0],
+			'android' => $configValues[1],
+			'ios' => $configValues[2],
+		], $util->getSyncClientUrls());
+	}
+
+	public function getSyncClientUrlsData() {
+		return [
+			[
+				['a', 'b', 'c'],
+				['d', 'e', 'f'],
+			],
+		];
+	}
+}
\ No newline at end of file
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
new file mode 100644
index 000000000000..5a11167a0461
--- /dev/null
+++ b/tests/phpunit.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<phpunit bootstrap="bootstrap.php"
+		 verbose="true"
+		 timeoutForSmallTests="900"
+		 timeoutForMediumTests="900"
+		 timeoutForLargeTests="900"
+		>
+	<testsuite name='ownCloud - FirstRunWizard App Tests'>
+		<directory suffix='test.php'>.</directory>
+	</testsuite>
+	<!-- filters for code coverage -->
+	<filter>
+		<whitelist>
+			<directory suffix=".php">../firstrunwizard</directory>
+			<exclude>
+				<directory suffix=".php">../firstrunwizard/l10n</directory>
+				<directory suffix=".php">../firstrunwizard/tests</directory>
+			</exclude>
+		</whitelist>
+	</filter>
+	<logging>
+		<!-- and this is where your report will be written -->
+		<log type="coverage-clover" target="./clover.xml"/>
+	</logging>
+</phpunit>
\ No newline at end of file
diff --git a/wizard.php b/wizard.php
index 0811d3736cb0..e412371c0276 100644
--- a/wizard.php
+++ b/wizard.php
@@ -20,22 +20,24 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
+namespace OCA\FirstRunWizard;
 
+use OCP\Defaults;
+use OCP\User;
+use OCP\Util as CoreUtil;
+use OCP\Template;
 
 // Check if we are a user
-OCP\User::checkLoggedIn();
+User::checkLoggedIn();
 
-$defaults = new \OCP\Defaults();
+$appManager = \OC::$server->getAppManager();
+$config = \OC::$server->getConfig();
+$defaults = new Defaults();
 
-//links to clients
-$clients = array(
-	'desktop' => OCP\Config::getSystemValue('customclient_desktop', $defaults->getSyncClientUrl()),
-	'android' => OCP\Config::getSystemValue('customclient_android', $defaults->getAndroidClientUrl()),
-	'ios'     => OCP\Config::getSystemValue('customclient_ios', $defaults->getiOSClientUrl())
-);
+$util = new Util($appManager, $config, $defaults);
 
-$tmpl = new OCP\Template( 'firstrunwizard', 'wizard', '' );
-$tmpl->assign('logo', OCP\Util::linkTo('core','img/logo-inverted.svg'));
-$tmpl->assign('clients', $clients);
+$tmpl = new Template('firstrunwizard', 'wizard', '');
+$tmpl->assign('logo', CoreUtil::linkTo('core','img/logo-inverted.svg'));
+$tmpl->assign('clients', $util->getSyncClientUrls());
+$tmpl->assign('edition', $util->getEdition());
 $tmpl->printPage();
-