diff --git a/tests/mention/controller_test.php b/tests/mention/controller_test.php
index 2e52c0cea7..c473da9db6 100644
--- a/tests/mention/controller_test.php
+++ b/tests/mention/controller_test.php
@@ -174,10 +174,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'friend',
 						'type'     => 'u',
 						'id'       => 7,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 1,
 					],
@@ -185,10 +182,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'Group we are a member of',
 						'type'     => 'g',
 						'id'       => 3,
-						'avatar'   => [
-							'type' => 'group',
-							'img'  => '',
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -196,10 +190,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'Normal group',
 						'type'     => 'g',
 						'id'       => 1,
-						'avatar'   => [
-							'type' => 'group',
-							'img'  => '',
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -207,10 +198,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'team_member_hidden',
 						'type'     => 'u',
 						'id'       => 6,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 1,
 					],
@@ -218,10 +206,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'team_member_normal',
 						'type'     => 'u',
 						'id'       => 5,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 1,
 					],
@@ -229,10 +214,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'myself',
 						'type'     => 'u',
 						'id'       => 2,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -240,10 +222,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'poster',
 						'type'     => 'u',
 						'id'       => 3,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -251,10 +230,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'replier',
 						'type'     => 'u',
 						'id'       => 4,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -262,10 +238,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'team_member_normal',
 						'type'     => 'u',
 						'id'       => 5,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -273,10 +246,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'team_member_hidden',
 						'type'     => 'u',
 						'id'       => 6,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -284,10 +254,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'friend',
 						'type'     => 'u',
 						'id'       => 7,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -295,10 +262,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'test',
 						'type'     => 'u',
 						'id'       => 8,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -306,10 +270,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'test1',
 						'type'     => 'u',
 						'id'       => 9,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -317,10 +278,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'Group we are a member of',
 						'type'     => 'g',
 						'id'       => 3,
-						'avatar'   => [
-							'type' => 'group',
-							'img'  => '',
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 1,
 					],
@@ -333,10 +291,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'friend',
 						'type'     => 'u',
 						'id'       => 7,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 1,
 					],
@@ -344,10 +299,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'Group we are a member of',
 						'type'     => 'g',
 						'id'       => 3,
-						'avatar'   => [
-							'type' => 'group',
-							'img'  => '',
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -355,10 +307,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'Normal group',
 						'type'     => 'g',
 						'id'       => 1,
-						'avatar'   => [
-							'type' => 'group',
-							'img'  => '',
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -366,10 +315,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'team_member_hidden',
 						'type'     => 'u',
 						'id'       => 6,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 1,
 					],
@@ -377,10 +323,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'team_member_normal',
 						'type'     => 'u',
 						'id'       => 5,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 1,
 					],
@@ -388,10 +331,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'replier',
 						'type'     => 'u',
 						'id'       => 4,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 1,
 					],
@@ -399,10 +339,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'poster',
 						'type'     => 'u',
 						'id'       => 3,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 5,
 					],
@@ -410,10 +347,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'myself',
 						'type'     => 'u',
 						'id'       => 2,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -421,10 +355,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'poster',
 						'type'     => 'u',
 						'id'       => 3,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -432,10 +363,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'replier',
 						'type'     => 'u',
 						'id'       => 4,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -443,10 +371,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'team_member_normal',
 						'type'     => 'u',
 						'id'       => 5,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -454,10 +379,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'team_member_hidden',
 						'type'     => 'u',
 						'id'       => 6,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -465,10 +387,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'friend',
 						'type'     => 'u',
 						'id'       => 7,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -476,10 +395,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'test',
 						'type'     => 'u',
 						'id'       => 8,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -487,10 +403,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'test1',
 						'type'     => 'u',
 						'id'       => 9,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -498,10 +411,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'Group we are a member of',
 						'type'     => 'g',
 						'id'       => 3,
-						'avatar'   => [
-							'type' => 'group',
-							'img'  => '',
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 1,
 					],
@@ -514,10 +424,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'team_member_hidden',
 						'type'     => 'u',
 						'id'       => 6,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 1,
 					],
@@ -525,10 +432,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'team_member_normal',
 						'type'     => 'u',
 						'id'       => 5,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 1,
 					],
@@ -536,10 +440,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'team_member_normal',
 						'type'     => 'u',
 						'id'       => 5,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -547,10 +448,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'team_member_hidden',
 						'type'     => 'u',
 						'id'       => 6,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -558,10 +456,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'test',
 						'type'     => 'u',
 						'id'       => 8,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -569,10 +464,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'test1',
 						'type'     => 'u',
 						'id'       => 9,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -580,10 +472,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'test2',
 						'type'     => 'u',
 						'id'       => 10,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -591,10 +480,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'test3',
 						'type'     => 'u',
 						'id'       => 11,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -607,10 +493,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'test',
 						'type'     => 'u',
 						'id'       => 8,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -618,10 +501,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'test1',
 						'type'     => 'u',
 						'id'       => 9,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -629,10 +509,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'test2',
 						'type'     => 'u',
 						'id'       => 10,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -640,10 +517,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 						'name'     => 'test3',
 						'type'     => 'u',
 						'id'       => 11,
-						'avatar'   => [
-							'type' => 'user',
-							'img'  => [],
-						],
+						'avatar'   => [],
 						'rank'     => '',
 						'priority' => 0,
 					],
@@ -655,10 +529,7 @@ class phpbb_mention_controller_test extends phpbb_database_test_case
 					'name'     => 'test1',
 					'type'     => 'u',
 					'id'       => 9,
-					'avatar'   => [
-						'type' => 'user',
-						'img'  => [],
-					],
+					'avatar'   => [],
 					'rank'     => '',
 					'priority' => 0,
 				]],