diff --git a/tests/notification/fixtures/email_notification.type.post.xml b/tests/notification/fixtures/email_notification.type.post.xml
index 6d064141b7..7a4a7191eb 100644
--- a/tests/notification/fixtures/email_notification.type.post.xml
+++ b/tests/notification/fixtures/email_notification.type.post.xml
@@ -164,12 +164,14 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
+		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
+			<value>1</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>2</value>
@@ -177,6 +179,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>2</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>3</value>
@@ -184,6 +187,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>3</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>4</value>
@@ -191,6 +195,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>4</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>5</value>
@@ -198,6 +203,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>5</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>6</value>
@@ -205,6 +211,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>6</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>7</value>
@@ -212,6 +219,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>7</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>8</value>
@@ -219,6 +227,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>8</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>2</value>
@@ -226,6 +235,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>9</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>3</value>
@@ -233,6 +243,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>10</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>4</value>
@@ -240,6 +251,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>11</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>5</value>
@@ -247,6 +259,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>12</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>6</value>
@@ -254,6 +267,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>13</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>7</value>
@@ -261,6 +275,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>14</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>8</value>
diff --git a/tests/notification/fixtures/submit_post_notification.type.bookmark.xml b/tests/notification/fixtures/submit_post_notification.type.bookmark.xml
index b6163e9ed0..1e6b6a19ca 100644
--- a/tests/notification/fixtures/submit_post_notification.type.bookmark.xml
+++ b/tests/notification/fixtures/submit_post_notification.type.bookmark.xml
@@ -119,12 +119,14 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
+		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
+			<value>1</value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>2</value>
@@ -132,6 +134,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>2</value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>3</value>
@@ -139,6 +142,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>3</value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>4</value>
@@ -146,6 +150,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>4</value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>5</value>
@@ -153,6 +158,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>5</value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>6</value>
@@ -160,6 +166,7 @@
 			<value>0</value>
 		</row>
 		<row>
+			<value>6</value>
 			<value>notification.type.bookmark</value>
 			<value>0</value>
 			<value>3</value>
diff --git a/tests/notification/fixtures/submit_post_notification.type.forum.xml b/tests/notification/fixtures/submit_post_notification.type.forum.xml
index b8df34bedc..c12c878604 100644
--- a/tests/notification/fixtures/submit_post_notification.type.forum.xml
+++ b/tests/notification/fixtures/submit_post_notification.type.forum.xml
@@ -155,12 +155,14 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
+		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
+			<value>1</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>2</value>
@@ -168,6 +170,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>2</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>3</value>
@@ -175,6 +178,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>3</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>4</value>
@@ -182,6 +186,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>4</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>5</value>
@@ -189,6 +194,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>5</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>6</value>
@@ -196,6 +202,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>6</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>7</value>
@@ -203,6 +210,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>7</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>8</value>
@@ -210,6 +218,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>8</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>2</value>
@@ -217,6 +226,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>9</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>3</value>
@@ -224,6 +234,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>10</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>4</value>
@@ -231,6 +242,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>11</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>5</value>
@@ -238,6 +250,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>12</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>6</value>
@@ -245,6 +258,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>13</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>7</value>
@@ -252,6 +266,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>14</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>8</value>
diff --git a/tests/notification/fixtures/submit_post_notification.type.mention.xml b/tests/notification/fixtures/submit_post_notification.type.mention.xml
index 86ae1fd037..7faf22c401 100644
--- a/tests/notification/fixtures/submit_post_notification.type.mention.xml
+++ b/tests/notification/fixtures/submit_post_notification.type.mention.xml
@@ -136,12 +136,14 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
+		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
+			<value>1</value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>2</value>
@@ -149,6 +151,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>2</value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>3</value>
@@ -156,6 +159,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>3</value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>4</value>
@@ -163,6 +167,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>4</value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>5</value>
@@ -170,6 +175,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>5</value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>6</value>
@@ -177,6 +183,7 @@
 			<value>0</value>
 		</row>
 		<row>
+			<value>6</value>
 			<value>notification.type.mention</value>
 			<value>0</value>
 			<value>8</value>
diff --git a/tests/notification/fixtures/submit_post_notification.type.post.xml b/tests/notification/fixtures/submit_post_notification.type.post.xml
index 75bfb03e89..7d760cd1eb 100644
--- a/tests/notification/fixtures/submit_post_notification.type.post.xml
+++ b/tests/notification/fixtures/submit_post_notification.type.post.xml
@@ -155,12 +155,14 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
+		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
+			<value>1</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>2</value>
@@ -168,6 +170,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>2</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>3</value>
@@ -175,6 +178,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>3</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>4</value>
@@ -182,6 +186,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>4</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>5</value>
@@ -189,6 +194,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>5</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>6</value>
@@ -196,6 +202,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>6</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>7</value>
@@ -203,6 +210,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>7</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>8</value>
@@ -210,6 +218,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>8</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>2</value>
@@ -217,6 +226,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>9</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>3</value>
@@ -224,6 +234,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>10</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>4</value>
@@ -231,6 +242,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>11</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>5</value>
@@ -238,6 +250,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>12</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>6</value>
@@ -245,6 +258,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>13</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>7</value>
@@ -252,6 +266,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>14</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>8</value>
diff --git a/tests/notification/fixtures/submit_post_notification.type.post_in_queue.xml b/tests/notification/fixtures/submit_post_notification.type.post_in_queue.xml
index 12e73b0ff2..fe0a99bdc5 100644
--- a/tests/notification/fixtures/submit_post_notification.type.post_in_queue.xml
+++ b/tests/notification/fixtures/submit_post_notification.type.post_in_queue.xml
@@ -103,12 +103,14 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
+		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
+			<value>1</value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>2</value>
@@ -116,6 +118,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>2</value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>3</value>
@@ -123,6 +126,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>3</value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>4</value>
@@ -130,6 +134,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>4</value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>5</value>
@@ -137,6 +142,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>5</value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>6</value>
@@ -144,6 +150,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>6</value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>7</value>
@@ -151,6 +158,7 @@
 			<value>0</value>
 		</row>
 		<row>
+			<value>7</value>
 			<value>notification.type.needs_approval</value>
 			<value>0</value>
 			<value>9</value>
diff --git a/tests/notification/fixtures/submit_post_notification.type.quote.xml b/tests/notification/fixtures/submit_post_notification.type.quote.xml
index 9f4ba91475..8fe85d0db3 100644
--- a/tests/notification/fixtures/submit_post_notification.type.quote.xml
+++ b/tests/notification/fixtures/submit_post_notification.type.quote.xml
@@ -91,12 +91,14 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
+		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
+			<value>1</value>
 			<value>notification.type.quote</value>
 			<value>0</value>
 			<value>2</value>
@@ -104,6 +106,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>2</value>
 			<value>notification.type.quote</value>
 			<value>0</value>
 			<value>3</value>
@@ -111,6 +114,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>3</value>
 			<value>notification.type.quote</value>
 			<value>0</value>
 			<value>4</value>
@@ -118,6 +122,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>4</value>
 			<value>notification.type.quote</value>
 			<value>0</value>
 			<value>5</value>
@@ -125,6 +130,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>5</value>
 			<value>notification.type.quote</value>
 			<value>0</value>
 			<value>6</value>
diff --git a/tests/notification/fixtures/submit_post_notification.type.topic.xml b/tests/notification/fixtures/submit_post_notification.type.topic.xml
index 1f96ed2ee7..eebab64e6b 100644
--- a/tests/notification/fixtures/submit_post_notification.type.topic.xml
+++ b/tests/notification/fixtures/submit_post_notification.type.topic.xml
@@ -99,12 +99,14 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
+		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
+			<value>1</value>
 			<value>notification.type.topic</value>
 			<value>0</value>
 			<value>2</value>
@@ -112,6 +114,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>2</value>
 			<value>notification.type.topic</value>
 			<value>0</value>
 			<value>6</value>
@@ -119,6 +122,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>3</value>
 			<value>notification.type.topic</value>
 			<value>0</value>
 			<value>7</value>
@@ -126,6 +130,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>4</value>
 			<value>notification.type.topic</value>
 			<value>0</value>
 			<value>8</value>
diff --git a/tests/notification/fixtures/webpush_notification.type.post.xml b/tests/notification/fixtures/webpush_notification.type.post.xml
index d59d5b92c4..89c5354030 100644
--- a/tests/notification/fixtures/webpush_notification.type.post.xml
+++ b/tests/notification/fixtures/webpush_notification.type.post.xml
@@ -185,12 +185,14 @@
 		</row>
 	</table>
 	<table name="phpbb_user_notifications">
+		<column>id</column>
 		<column>item_type</column>
 		<column>item_id</column>
 		<column>user_id</column>
 		<column>method</column>
 		<column>notify</column>
 		<row>
+			<value>1</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>2</value>
@@ -198,6 +200,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>2</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>3</value>
@@ -205,6 +208,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>3</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>4</value>
@@ -212,6 +216,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>4</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>5</value>
@@ -219,6 +224,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>5</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>6</value>
@@ -226,6 +232,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>6</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>7</value>
@@ -233,6 +240,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>7</value>
 			<value>notification.type.post</value>
 			<value>0</value>
 			<value>8</value>
@@ -240,6 +248,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>8</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>2</value>
@@ -247,6 +256,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>9</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>3</value>
@@ -254,6 +264,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>10</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>4</value>
@@ -261,6 +272,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>11</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>5</value>
@@ -268,6 +280,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>12</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>6</value>
@@ -275,6 +288,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>13</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>7</value>
@@ -282,6 +296,7 @@
 			<value>1</value>
 		</row>
 		<row>
+			<value>14</value>
 			<value>notification.type.forum</value>
 			<value>0</value>
 			<value>8</value>