diff --git a/protected/humhub/modules/admin/libs/OnlineModuleManager.php b/protected/humhub/modules/admin/libs/OnlineModuleManager.php
index 075e42c90e..3bd07deaa2 100644
--- a/protected/humhub/modules/admin/libs/OnlineModuleManager.php
+++ b/protected/humhub/modules/admin/libs/OnlineModuleManager.php
@@ -85,7 +85,7 @@ class OnlineModuleManager
         if (file_exists($downloadTargetFileName)) {
             $zip = new ZipArchive;
             $res = $zip->open($downloadTargetFileName);
-            if ($res === TRUE) {
+            if ($res === true) {
                 $zip->extractTo($modulePath);
                 $zip->close();
             } else {
diff --git a/protected/humhub/modules/admin/tests/codeception/fixtures/data/group.php b/protected/humhub/modules/admin/tests/codeception/fixtures/data/group.php
index 6f9308907f..10aef932e0 100644
--- a/protected/humhub/modules/admin/tests/codeception/fixtures/data/group.php
+++ b/protected/humhub/modules/admin/tests/codeception/fixtures/data/group.php
@@ -18,7 +18,7 @@
  * GNU Affero General Public License for more details.
  */
 return [
-    ['id' => '1', 'space_id' => 1, 'name' => 'Administrator', 'description' => 'Administrator Group', 'created_at' => '2014-08-30 14:03:49', 'created_by' => NULL, 'updated_at' => NULL, 'updated_by' => NULL, 'ldap_dn' => NULL, 'is_admin_group' => 1],
-    ['id' => '2', 'space_id' => 1, 'name' => 'Users', 'description' => 'Example Group by Installer', 'created_at' => '2014-08-30 14:03:49', 'created_by' => NULL, 'updated_at' => NULL, 'updated_by' => NULL, 'ldap_dn' => NULL],
-    ['id' => '3', 'space_id' => 1, 'name' => 'Manager', 'description' => 'Manager Group', 'created_at' => '2014-08-30 14:03:49', 'created_by' => NULL, 'updated_at' => NULL, 'updated_by' => NULL, 'ldap_dn' => NULL]
+    ['id' => '1', 'space_id' => 1, 'name' => 'Administrator', 'description' => 'Administrator Group', 'created_at' => '2014-08-30 14:03:49', 'created_by' => null, 'updated_at' => null, 'updated_by' => null, 'ldap_dn' => null, 'is_admin_group' => 1],
+    ['id' => '2', 'space_id' => 1, 'name' => 'Users', 'description' => 'Example Group by Installer', 'created_at' => '2014-08-30 14:03:49', 'created_by' => null, 'updated_at' => null, 'updated_by' => null, 'ldap_dn' => null],
+    ['id' => '3', 'space_id' => 1, 'name' => 'Manager', 'description' => 'Manager Group', 'created_at' => '2014-08-30 14:03:49', 'created_by' => null, 'updated_at' => null, 'updated_by' => null, 'ldap_dn' => null]
 ];
diff --git a/protected/humhub/modules/admin/views/user/list.php b/protected/humhub/modules/admin/views/user/list.php
index c0cf1774aa..6797eed375 100644
--- a/protected/humhub/modules/admin/views/user/list.php
+++ b/protected/humhub/modules/admin/views/user/list.php
@@ -61,7 +61,7 @@ use yii\widgets\ActiveForm;
                     'label' => Yii::t('AdminModule.user', 'Last login'),
                     'options' => ['style' => 'width:120px;'],
                     'value' => function ($data) {
-                        return ($data->last_login == NULL) ? Yii::t('AdminModule.user', 'never') : Yii::$app->formatter->asDate($data->last_login);
+                        return ($data->last_login == null) ? Yii::t('AdminModule.user', 'never') : Yii::$app->formatter->asDate($data->last_login);
                     }
                 ],
                 ['class' => UserActionColumn::class],
diff --git a/protected/humhub/modules/post/tests/codeception/fixtures/data/post.php b/protected/humhub/modules/post/tests/codeception/fixtures/data/post.php
index c5ac8fb54a..59feb0d06e 100644
--- a/protected/humhub/modules/post/tests/codeception/fixtures/data/post.php
+++ b/protected/humhub/modules/post/tests/codeception/fixtures/data/post.php
@@ -18,16 +18,16 @@
  * GNU Affero General Public License for more details.
  */
 return array(
-    array('id' => '1', 'message_2trash' => NULL, 'message' => 'User 1 Profile Post Private', 'url' => NULL, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '1'),
-    array('id' => '2', 'message_2trash' => NULL, 'message' => 'User 1 Profile Post Public', 'url' => NULL, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '1'),
-    array('id' => '3', 'message_2trash' => NULL, 'message' => 'User 2 Profile Post Private', 'url' => NULL, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '2', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '2'),
-    array('id' => '4', 'message_2trash' => NULL, 'message' => 'User 2 Profile Post Public', 'url' => NULL, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '2', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '2'),
-    array('id' => '5', 'message_2trash' => NULL, 'message' => 'User 3 Profile Post Private', 'url' => NULL, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '3', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '3'),
-    array('id' => '6', 'message_2trash' => NULL, 'message' => 'User 3 Profile Post Public', 'url' => NULL, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '3', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '3'),
-    array('id' => '7', 'message_2trash' => NULL, 'message' => 'User 1 Space 1 Post Public ', 'url' => NULL, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '1'),
-    array('id' => '8', 'message_2trash' => NULL, 'message' => 'User 1 Space 1 Post Private ', 'url' => NULL, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '1'),
-    array('id' => '9', 'message_2trash' => NULL, 'message' => 'User 3 Space 1 Post Public ', 'url' => NULL, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '3', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '3'),
+    array('id' => '1', 'message_2trash' => null, 'message' => 'User 1 Profile Post Private', 'url' => null, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '1'),
+    array('id' => '2', 'message_2trash' => null, 'message' => 'User 1 Profile Post Public', 'url' => null, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '1'),
+    array('id' => '3', 'message_2trash' => null, 'message' => 'User 2 Profile Post Private', 'url' => null, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '2', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '2'),
+    array('id' => '4', 'message_2trash' => null, 'message' => 'User 2 Profile Post Public', 'url' => null, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '2', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '2'),
+    array('id' => '5', 'message_2trash' => null, 'message' => 'User 3 Profile Post Private', 'url' => null, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '3', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '3'),
+    array('id' => '6', 'message_2trash' => null, 'message' => 'User 3 Profile Post Public', 'url' => null, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '3', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '3'),
+    array('id' => '7', 'message_2trash' => null, 'message' => 'User 1 Space 1 Post Public ', 'url' => null, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '1'),
+    array('id' => '8', 'message_2trash' => null, 'message' => 'User 1 Space 1 Post Private ', 'url' => null, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '1'),
+    array('id' => '9', 'message_2trash' => null, 'message' => 'User 3 Space 1 Post Public ', 'url' => null, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '3', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '3'),
 
-    array('id' => '10', 'message_2trash' => NULL, 'message' => 'User 2 Space 2 Post Public', 'url' => NULL, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '1'),
-    array('id' => '11', 'message_2trash' => NULL, 'message' => 'User 2 Space 2 Post Private', 'url' => NULL, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '1'),
+    array('id' => '10', 'message_2trash' => null, 'message' => 'User 2 Space 2 Post Public', 'url' => null, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '1'),
+    array('id' => '11', 'message_2trash' => null, 'message' => 'User 2 Space 2 Post Private', 'url' => null, 'created_at' => '2014-08-08 05:36:06', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:06', 'updated_by' => '1'),
 );
diff --git a/protected/humhub/modules/space/modules/manage/controllers/ImageController.php b/protected/humhub/modules/space/modules/manage/controllers/ImageController.php
index 6a7a1a6ab0..291a9ff366 100644
--- a/protected/humhub/modules/space/modules/manage/controllers/ImageController.php
+++ b/protected/humhub/modules/space/modules/manage/controllers/ImageController.php
@@ -139,7 +139,7 @@ class ImageController extends Controller
         $type = Yii::$app->request->get('type', 'profile');
         $json = array('type' => $type);
 
-        $image = NULL;
+        $image = null;
         if ($type == 'profile') {
             $image = new ProfileImage($space->guid, 'default_space');
         } elseif ($type == 'banner') {
diff --git a/protected/humhub/modules/space/tests/codeception/fixtures/data/space.php b/protected/humhub/modules/space/tests/codeception/fixtures/data/space.php
index d73c86e2a6..855a534625 100644
--- a/protected/humhub/modules/space/tests/codeception/fixtures/data/space.php
+++ b/protected/humhub/modules/space/tests/codeception/fixtures/data/space.php
@@ -18,8 +18,8 @@
  * GNU Affero General Public License for more details.
  */
 return array(
-    array('id' => '1', 'guid' => '5396d499-20d6-4233-800b-c6c86e5fa34a', 'name' => 'Space 1', 'contentcontainer_id' => '4', 'description' => 'Space by Admin', 'join_policy' => '1', 'visibility' => '2', 'status' => '1', 'tags' => NULL, 'created_at' => '2014-08-08 05:36:04', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:04', 'updated_by' => '1', 'ldap_dn' => NULL, 'auto_add_new_members' => '0'),
-    array('id' => '2', 'guid' => '5396d499-20d6-4233-800b-c6c86e5fa34b', 'name' => 'Space 2', 'contentcontainer_id' => '5', 'description' => 'User 1 Space', 'join_policy' => '2', 'visibility' => '2', 'status' => '1', 'tags' => NULL, 'created_at' => '2014-08-08 05:36:04', 'created_by' => '2', 'updated_at' => '2014-08-08 05:36:04', 'updated_by' => '2', 'ldap_dn' => NULL, 'auto_add_new_members' => '0'),
-    array('id' => '3', 'guid' => '5396d499-20d6-4233-800b-c6c86e5fa34c', 'name' => 'Space 3', 'contentcontainer_id' => '6', 'description' => 'Another User 1 Space', 'join_policy' => '2', 'visibility' => '2', 'status' => '1', 'tags' => NULL, 'created_at' => '2014-08-08 05:36:04', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:04', 'updated_by' => '2', 'ldap_dn' => NULL, 'auto_add_new_members' => '1'),
-    array('id' => '4', 'guid' => '5396d499-20d6-4233-800b-c6c86e5fa34d', 'name' => 'Space 4', 'contentcontainer_id' => '7', 'description' => 'User 1/2 Space', 'join_policy' => '2', 'visibility' => '2', 'status' => '1', 'tags' => NULL, 'created_at' => '2014-08-08 05:36:04', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:04', 'updated_by' => '2', 'ldap_dn' => NULL, 'auto_add_new_members' => '1')
+    array('id' => '1', 'guid' => '5396d499-20d6-4233-800b-c6c86e5fa34a', 'name' => 'Space 1', 'contentcontainer_id' => '4', 'description' => 'Space by Admin', 'join_policy' => '1', 'visibility' => '2', 'status' => '1', 'tags' => null, 'created_at' => '2014-08-08 05:36:04', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:04', 'updated_by' => '1', 'ldap_dn' => null, 'auto_add_new_members' => '0'),
+    array('id' => '2', 'guid' => '5396d499-20d6-4233-800b-c6c86e5fa34b', 'name' => 'Space 2', 'contentcontainer_id' => '5', 'description' => 'User 1 Space', 'join_policy' => '2', 'visibility' => '2', 'status' => '1', 'tags' => null, 'created_at' => '2014-08-08 05:36:04', 'created_by' => '2', 'updated_at' => '2014-08-08 05:36:04', 'updated_by' => '2', 'ldap_dn' => null, 'auto_add_new_members' => '0'),
+    array('id' => '3', 'guid' => '5396d499-20d6-4233-800b-c6c86e5fa34c', 'name' => 'Space 3', 'contentcontainer_id' => '6', 'description' => 'Another User 1 Space', 'join_policy' => '2', 'visibility' => '2', 'status' => '1', 'tags' => null, 'created_at' => '2014-08-08 05:36:04', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:04', 'updated_by' => '2', 'ldap_dn' => null, 'auto_add_new_members' => '1'),
+    array('id' => '4', 'guid' => '5396d499-20d6-4233-800b-c6c86e5fa34d', 'name' => 'Space 4', 'contentcontainer_id' => '7', 'description' => 'User 1/2 Space', 'join_policy' => '2', 'visibility' => '2', 'status' => '1', 'tags' => null, 'created_at' => '2014-08-08 05:36:04', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:04', 'updated_by' => '2', 'ldap_dn' => null, 'auto_add_new_members' => '1')
 );
diff --git a/protected/humhub/modules/space/tests/codeception/fixtures/data/space_membership.php b/protected/humhub/modules/space/tests/codeception/fixtures/data/space_membership.php
index 0ab9c62503..86615b819d 100644
--- a/protected/humhub/modules/space/tests/codeception/fixtures/data/space_membership.php
+++ b/protected/humhub/modules/space/tests/codeception/fixtures/data/space_membership.php
@@ -20,20 +20,20 @@
 return array(
 
     // User 1 & 3  are Member of Space 1
-    array('space_id' => '1', 'user_id' => '1', 'originator_user_id' => NULL, 'status' => '3', 'request_message' => NULL, 'last_visit' => '2014-08-08 06:49:57', 'group_id' => 'admin', 'created_at' => '2014-08-08 05:36:05', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:05', 'updated_by' => '1'),
-    array('space_id' => '1', 'user_id' => '3', 'originator_user_id' => NULL, 'status' => '3', 'request_message' => NULL, 'last_visit' => NULL, 'group_id' => 'member', 'created_at' => '2014-08-10 16:55:41', 'created_by' => NULL, 'updated_at' => NULL, 'updated_by' => NULL),
+    array('space_id' => '1', 'user_id' => '1', 'originator_user_id' => null, 'status' => '3', 'request_message' => null, 'last_visit' => '2014-08-08 06:49:57', 'group_id' => 'admin', 'created_at' => '2014-08-08 05:36:05', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:05', 'updated_by' => '1'),
+    array('space_id' => '1', 'user_id' => '3', 'originator_user_id' => null, 'status' => '3', 'request_message' => null, 'last_visit' => null, 'group_id' => 'member', 'created_at' => '2014-08-10 16:55:41', 'created_by' => null, 'updated_at' => null, 'updated_by' => null),
 
     // User 2 is Member/Admin of Space 2
-    array('space_id' => '2', 'user_id' => '2', 'originator_user_id' => NULL, 'status' => '3', 'request_message' => NULL, 'last_visit' => '2014-08-08 06:49:57', 'group_id' => 'admin', 'created_at' => '2014-08-08 05:36:05', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:05', 'updated_by' => '1'),
+    array('space_id' => '2', 'user_id' => '2', 'originator_user_id' => null, 'status' => '3', 'request_message' => null, 'last_visit' => '2014-08-08 06:49:57', 'group_id' => 'admin', 'created_at' => '2014-08-08 05:36:05', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:05', 'updated_by' => '1'),
     
     // User 1 is admin of space 3 and user 2 & 3 are members
-    array('space_id' => '3', 'user_id' => '1', 'originator_user_id' => NULL, 'status' => '3', 'request_message' => NULL, 'last_visit' => '2014-08-08 06:49:57', 'group_id' => 'admin', 'created_at' => '2014-08-08 05:36:05', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:05', 'updated_by' => '1'),
-    array('space_id' => '3', 'user_id' => '2', 'originator_user_id' => NULL, 'status' => '3', 'send_notifications' => '1', 'request_message' => NULL, 'last_visit' => NULL, 'group_id' => 'member', 'created_at' => '2014-08-10 16:55:41', 'created_by' => NULL, 'updated_at' => NULL, 'updated_by' => NULL),
-    array('space_id' => '3', 'user_id' => '3', 'originator_user_id' => NULL, 'status' => '3', 'request_message' => NULL, 'last_visit' => '2014-08-08 06:49:57', 'group_id' => 'moderator', 'created_at' => '2014-08-08 05:36:05', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:05', 'updated_by' => '1'),
+    array('space_id' => '3', 'user_id' => '1', 'originator_user_id' => null, 'status' => '3', 'request_message' => null, 'last_visit' => '2014-08-08 06:49:57', 'group_id' => 'admin', 'created_at' => '2014-08-08 05:36:05', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:05', 'updated_by' => '1'),
+    array('space_id' => '3', 'user_id' => '2', 'originator_user_id' => null, 'status' => '3', 'send_notifications' => '1', 'request_message' => null, 'last_visit' => null, 'group_id' => 'member', 'created_at' => '2014-08-10 16:55:41', 'created_by' => null, 'updated_at' => null, 'updated_by' => null),
+    array('space_id' => '3', 'user_id' => '3', 'originator_user_id' => null, 'status' => '3', 'request_message' => null, 'last_visit' => '2014-08-08 06:49:57', 'group_id' => 'moderator', 'created_at' => '2014-08-08 05:36:05', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:05', 'updated_by' => '1'),
 
     // User 1/2 is admin of space 3 and user 3 is members
-    array('space_id' => '4', 'user_id' => '1', 'originator_user_id' => NULL, 'status' => '3', 'request_message' => NULL, 'last_visit' => '2014-08-08 06:49:57', 'group_id' => 'admin', 'created_at' => '2014-08-08 05:36:05', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:05', 'updated_by' => '1'),
-    array('space_id' => '4', 'user_id' => '2', 'originator_user_id' => NULL, 'status' => '3', 'request_message' => NULL, 'last_visit' => NULL, 'group_id' => 'admin', 'created_at' => '2014-08-10 16:55:41', 'created_by' => NULL, 'updated_at' => NULL, 'updated_by' => NULL),
-    array('space_id' => '4', 'user_id' => '3', 'originator_user_id' => NULL, 'status' => '3', 'request_message' => NULL, 'last_visit' => '2014-08-08 06:49:57', 'group_id' => 'member', 'created_at' => '2014-08-08 05:36:05', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:05', 'updated_by' => '1'),
+    array('space_id' => '4', 'user_id' => '1', 'originator_user_id' => null, 'status' => '3', 'request_message' => null, 'last_visit' => '2014-08-08 06:49:57', 'group_id' => 'admin', 'created_at' => '2014-08-08 05:36:05', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:05', 'updated_by' => '1'),
+    array('space_id' => '4', 'user_id' => '2', 'originator_user_id' => null, 'status' => '3', 'request_message' => null, 'last_visit' => null, 'group_id' => 'admin', 'created_at' => '2014-08-10 16:55:41', 'created_by' => null, 'updated_at' => null, 'updated_by' => null),
+    array('space_id' => '4', 'user_id' => '3', 'originator_user_id' => null, 'status' => '3', 'request_message' => null, 'last_visit' => '2014-08-08 06:49:57', 'group_id' => 'member', 'created_at' => '2014-08-08 05:36:05', 'created_by' => '1', 'updated_at' => '2014-08-08 05:36:05', 'updated_by' => '1'),
 
 );
diff --git a/protected/humhub/modules/user/tests/codeception/fixtures/data/group.php b/protected/humhub/modules/user/tests/codeception/fixtures/data/group.php
index ffcd39110f..5ff848ac6a 100644
--- a/protected/humhub/modules/user/tests/codeception/fixtures/data/group.php
+++ b/protected/humhub/modules/user/tests/codeception/fixtures/data/group.php
@@ -18,7 +18,7 @@
  * GNU Affero General Public License for more details.
  */
 return array(
-    array('id' => '1', 'space_id' => 1, 'name' => 'Administrator', 'description' => 'Administrator Group', 'created_at' => '2014-08-30 14:03:49', 'created_by' => NULL, 'updated_at' => NULL, 'updated_by' => NULL, 'ldap_dn' => NULL, 'is_admin_group' => 1),
-    array('id' => '2', 'space_id' => 1, 'name' => 'Users', 'description' => 'Example Group by Installer', 'created_at' => '2014-08-30 14:03:49', 'created_by' => NULL, 'updated_at' => NULL, 'updated_by' => NULL, 'ldap_dn' => NULL),
-    array('id' => '3', 'space_id' => 1, 'name' => 'Moderators', 'description' => 'Example Moderator group', 'created_at' => '2014-08-30 14:03:49', 'created_by' => NULL, 'updated_at' => NULL, 'updated_by' => NULL, 'ldap_dn' => NULL)
+    array('id' => '1', 'space_id' => 1, 'name' => 'Administrator', 'description' => 'Administrator Group', 'created_at' => '2014-08-30 14:03:49', 'created_by' => null, 'updated_at' => null, 'updated_by' => null, 'ldap_dn' => null, 'is_admin_group' => 1),
+    array('id' => '2', 'space_id' => 1, 'name' => 'Users', 'description' => 'Example Group by Installer', 'created_at' => '2014-08-30 14:03:49', 'created_by' => null, 'updated_at' => null, 'updated_by' => null, 'ldap_dn' => null),
+    array('id' => '3', 'space_id' => 1, 'name' => 'Moderators', 'description' => 'Example Moderator group', 'created_at' => '2014-08-30 14:03:49', 'created_by' => null, 'updated_at' => null, 'updated_by' => null, 'ldap_dn' => null)
 );
diff --git a/protected/humhub/modules/user/tests/codeception/fixtures/data/group_user.php b/protected/humhub/modules/user/tests/codeception/fixtures/data/group_user.php
index e40cc062c3..426ee25868 100644
--- a/protected/humhub/modules/user/tests/codeception/fixtures/data/group_user.php
+++ b/protected/humhub/modules/user/tests/codeception/fixtures/data/group_user.php
@@ -18,8 +18,8 @@
  * GNU Affero General Public License for more details.
  */
 return [
-    ['id' => 1, 'user_id' => 1, 'group_id' => 1, 'created_at' => '2014-08-30 14:03:49', 'created_by' => NULL, 'updated_at' => NULL, 'updated_by' => NULL],
-    ['id' => 2, 'user_id' => 2, 'group_id' => 2, 'created_at' => '2014-08-30 14:03:49', 'created_by' => NULL, 'updated_at' => NULL, 'updated_by' => NULL],
-    ['id' => 3, 'user_id' => 3, 'group_id' => 3, 'is_group_manager' => '1', 'created_at' => '2014-08-30 14:03:49', 'created_by' => NULL, 'updated_at' => NULL, 'updated_by' => NULL],
-    ['id' => 4, 'user_id' => 6, 'group_id' => 3, 'created_at' => '2014-08-30 14:03:49', 'created_by' => NULL, 'updated_at' => NULL, 'updated_by' => NULL]
+    ['id' => 1, 'user_id' => 1, 'group_id' => 1, 'created_at' => '2014-08-30 14:03:49', 'created_by' => null, 'updated_at' => null, 'updated_by' => null],
+    ['id' => 2, 'user_id' => 2, 'group_id' => 2, 'created_at' => '2014-08-30 14:03:49', 'created_by' => null, 'updated_at' => null, 'updated_by' => null],
+    ['id' => 3, 'user_id' => 3, 'group_id' => 3, 'is_group_manager' => '1', 'created_at' => '2014-08-30 14:03:49', 'created_by' => null, 'updated_at' => null, 'updated_by' => null],
+    ['id' => 4, 'user_id' => 6, 'group_id' => 3, 'created_at' => '2014-08-30 14:03:49', 'created_by' => null, 'updated_at' => null, 'updated_by' => null]
 ];
diff --git a/protected/humhub/modules/user/tests/codeception/fixtures/data/user.php b/protected/humhub/modules/user/tests/codeception/fixtures/data/user.php
index b801bf5804..c0447d293c 100644
--- a/protected/humhub/modules/user/tests/codeception/fixtures/data/user.php
+++ b/protected/humhub/modules/user/tests/codeception/fixtures/data/user.php
@@ -19,11 +19,11 @@
  */
 return array(
     // Working Users
-    array('id' => 1, 'guid' => '01e50e0d-82cd-41fc-8b0c-552392f5839c', 'status' => '1','username' => 'Admin', 'email' => 'admin@example.com', 'contentcontainer_id' => 1, 'auth_mode' => 'local', 'tags' => NULL, 'language' => 'en', 'created_at' => '2014-08-08 05:36:02', 'created_by' => NULL, 'updated_at' => '2014-08-08 05:36:19', 'updated_by' => '1', 'last_login' => '2014-08-05 05:36:16'),
-    array('id' => 2, 'guid' => '01e50e0d-82cd-41fc-8b0c-552392f5839d', 'status' => '1','username' => 'User1', 'email' => 'user1@example.com', 'contentcontainer_id' => 2, 'auth_mode' => 'local', 'tags' => NULL, 'language' => 'en', 'created_at' => '2014-08-08 05:36:02', 'created_by' => NULL, 'updated_at' => '2014-08-08 05:36:19', 'updated_by' => '1', 'last_login' => '2014-08-06 05:36:16'),
-    array('id' => 3, 'guid' => '01e50e0d-82cd-41fc-8b0c-552392f5839e', 'status' => '1','username' => 'User2', 'email' => 'user2@example.com', 'contentcontainer_id' => 3, 'auth_mode' => 'local', 'tags' => NULL, 'language' => 'en', 'created_at' => '2014-08-08 05:36:02', 'created_by' => NULL, 'updated_at' => '2014-08-08 05:36:19', 'updated_by' => '1', 'last_login' => '2014-08-07 05:36:16'),
-    array('id' => 4, 'guid' => '01e50e0d-82cd-41fc-8b0c-552392f5839f', 'status' => '1','username' => 'User3', 'email' => 'user3@example.com', 'contentcontainer_id' => 8, 'auth_mode' => 'local', 'tags' => NULL, 'language' => 'en', 'created_at' => '2014-08-08 05:36:02', 'created_by' => NULL, 'updated_at' => '2014-08-08 05:36:19', 'updated_by' => '1', 'last_login' => '2014-08-07 05:36:16'),
-    array('id' => 5, 'guid' => '01e50e0d-82cd-41fc-8b0c-552392f5839g', 'status' => '0','username' => 'DisabledUser', 'email' => 'disabled@example.com', 'contentcontainer_id' => 9, 'auth_mode' => 'local', 'tags' => NULL, 'language' => 'en', 'created_at' => '2014-08-08 05:36:02', 'created_by' => NULL, 'updated_at' => '2014-08-08 05:36:19', 'updated_by' => '1', 'last_login' => '2014-08-07 05:36:16'),
-    array('id' => 6, 'guid' => '01e50e0d-82cd-41fc-8b0c-552392f5839h', 'status' => '2','username' => 'UnapprovedUser', 'email' => 'unnapproved@example.com', 'contentcontainer_id' => 10, 'auth_mode' => 'local', 'tags' => NULL, 'language' => 'en', 'created_at' => '2014-08-08 05:36:02', 'created_by' => NULL, 'updated_at' => '2014-08-08 05:36:19', 'updated_by' => '1', 'last_login' => '2014-08-07 05:36:16'),
-    array('id' => 7, 'guid' => '01e50e0d-82cd-41fc-8b0c-552392f5839i', 'status' => '2','username' => 'UnapprovedNoGroup', 'email' => 'unnapprovedNoGroup@example.com', 'contentcontainer_id' => 11, 'auth_mode' => 'local', 'tags' => NULL, 'language' => 'en', 'created_at' => '2014-08-08 05:36:02', 'created_by' => NULL, 'updated_at' => '2014-08-08 05:36:19', 'updated_by' => '1', 'last_login' => '2014-08-07 05:36:16'),
+    array('id' => 1, 'guid' => '01e50e0d-82cd-41fc-8b0c-552392f5839c', 'status' => '1','username' => 'Admin', 'email' => 'admin@example.com', 'contentcontainer_id' => 1, 'auth_mode' => 'local', 'tags' => null, 'language' => 'en', 'created_at' => '2014-08-08 05:36:02', 'created_by' => null, 'updated_at' => '2014-08-08 05:36:19', 'updated_by' => '1', 'last_login' => '2014-08-05 05:36:16'),
+    array('id' => 2, 'guid' => '01e50e0d-82cd-41fc-8b0c-552392f5839d', 'status' => '1','username' => 'User1', 'email' => 'user1@example.com', 'contentcontainer_id' => 2, 'auth_mode' => 'local', 'tags' => null, 'language' => 'en', 'created_at' => '2014-08-08 05:36:02', 'created_by' => null, 'updated_at' => '2014-08-08 05:36:19', 'updated_by' => '1', 'last_login' => '2014-08-06 05:36:16'),
+    array('id' => 3, 'guid' => '01e50e0d-82cd-41fc-8b0c-552392f5839e', 'status' => '1','username' => 'User2', 'email' => 'user2@example.com', 'contentcontainer_id' => 3, 'auth_mode' => 'local', 'tags' => null, 'language' => 'en', 'created_at' => '2014-08-08 05:36:02', 'created_by' => null, 'updated_at' => '2014-08-08 05:36:19', 'updated_by' => '1', 'last_login' => '2014-08-07 05:36:16'),
+    array('id' => 4, 'guid' => '01e50e0d-82cd-41fc-8b0c-552392f5839f', 'status' => '1','username' => 'User3', 'email' => 'user3@example.com', 'contentcontainer_id' => 8, 'auth_mode' => 'local', 'tags' => null, 'language' => 'en', 'created_at' => '2014-08-08 05:36:02', 'created_by' => null, 'updated_at' => '2014-08-08 05:36:19', 'updated_by' => '1', 'last_login' => '2014-08-07 05:36:16'),
+    array('id' => 5, 'guid' => '01e50e0d-82cd-41fc-8b0c-552392f5839g', 'status' => '0','username' => 'DisabledUser', 'email' => 'disabled@example.com', 'contentcontainer_id' => 9, 'auth_mode' => 'local', 'tags' => null, 'language' => 'en', 'created_at' => '2014-08-08 05:36:02', 'created_by' => null, 'updated_at' => '2014-08-08 05:36:19', 'updated_by' => '1', 'last_login' => '2014-08-07 05:36:16'),
+    array('id' => 6, 'guid' => '01e50e0d-82cd-41fc-8b0c-552392f5839h', 'status' => '2','username' => 'UnapprovedUser', 'email' => 'unnapproved@example.com', 'contentcontainer_id' => 10, 'auth_mode' => 'local', 'tags' => null, 'language' => 'en', 'created_at' => '2014-08-08 05:36:02', 'created_by' => null, 'updated_at' => '2014-08-08 05:36:19', 'updated_by' => '1', 'last_login' => '2014-08-07 05:36:16'),
+    array('id' => 7, 'guid' => '01e50e0d-82cd-41fc-8b0c-552392f5839i', 'status' => '2','username' => 'UnapprovedNoGroup', 'email' => 'unnapprovedNoGroup@example.com', 'contentcontainer_id' => 11, 'auth_mode' => 'local', 'tags' => null, 'language' => 'en', 'created_at' => '2014-08-08 05:36:02', 'created_by' => null, 'updated_at' => '2014-08-08 05:36:19', 'updated_by' => '1', 'last_login' => '2014-08-07 05:36:16'),
 );
diff --git a/protected/humhub/modules/user/tests/codeception/fixtures/data/user_setting.php b/protected/humhub/modules/user/tests/codeception/fixtures/data/user_setting.php
index c6adc1843d..400ecdfd92 100644
--- a/protected/humhub/modules/user/tests/codeception/fixtures/data/user_setting.php
+++ b/protected/humhub/modules/user/tests/codeception/fixtures/data/user_setting.php
@@ -1,8 +1,8 @@
 <?php
 
 return array(
-    array('user_id' => '1', 'module_id' => 'core', 'name' => 'globalSetting', 'value' => 'abc', 'created_at' => NULL, 'created_by' => NULL, 'updated_at' => NULL, 'updated_by' => NULL),
-    array('user_id' => '1', 'module_id' => 'someModule', 'name' => 'moduleSetting', 'value' => 'cba', 'created_at' => NULL, 'created_by' => NULL, 'updated_at' => NULL, 'updated_by' => NULL),
-    array('user_id' => '2', 'module_id' => 'core', 'name' => 'globalSetting', 'value' => 'xxx', 'created_at' => NULL, 'created_by' => NULL, 'updated_at' => NULL, 'updated_by' => NULL),
-    array('user_id' => '2', 'module_id' => 'someModule', 'name' => 'moduleSetting', 'value' => 'yyy', 'created_at' => NULL, 'created_by' => NULL, 'updated_at' => NULL, 'updated_by' => NULL)
+    array('user_id' => '1', 'module_id' => 'core', 'name' => 'globalSetting', 'value' => 'abc', 'created_at' => null, 'created_by' => null, 'updated_at' => null, 'updated_by' => null),
+    array('user_id' => '1', 'module_id' => 'someModule', 'name' => 'moduleSetting', 'value' => 'cba', 'created_at' => null, 'created_by' => null, 'updated_at' => null, 'updated_by' => null),
+    array('user_id' => '2', 'module_id' => 'core', 'name' => 'globalSetting', 'value' => 'xxx', 'created_at' => null, 'created_by' => null, 'updated_at' => null, 'updated_by' => null),
+    array('user_id' => '2', 'module_id' => 'someModule', 'name' => 'moduleSetting', 'value' => 'yyy', 'created_at' => null, 'created_by' => null, 'updated_at' => null, 'updated_by' => null)
 );
diff --git a/protected/humhub/tests/codeception/config/dynamic.php b/protected/humhub/tests/codeception/config/dynamic.php
index 69efa3c090..78c96b051e 100644
--- a/protected/humhub/tests/codeception/config/dynamic.php
+++ b/protected/humhub/tests/codeception/config/dynamic.php
@@ -32,6 +32,6 @@
   'params' => 
   array (
     'config_created_at' => 1509135303,
-    'horImageScrollOnMobile' => NULL,
+    'horImageScrollOnMobile' => null,
   ),
 ); ?>
\ No newline at end of file