Index: branches/cname-collision/t/dns-unitbase.sql
===================================================================
--- branches/cname-collision/t/dns-unitbase.sql	(revision 1016)
+++ branches/cname-collision/t/dns-unitbase.sql	(revision 1017)
@@ -659,5 +659,5 @@
 4	expiry1.test	1		1	2026011400	D	t	
 5	expiry2.test	1		1	2026011901	D	t	
-6	expiry3.test	1		1	2026013007	D	t	
+6	expiry3.test	1		1	2026020311	D	t	
 \.
 
@@ -801,4 +801,16 @@
 92	6	1	1	admin	Initial User	Added record 'nostamp3b.expiry3.test TXT to change', TTL 5400	2026-01-30 15:29:57.875273-05	0	0
 93	6	1	1	admin	Initial User	Added record 'nostamp4b.expiry3.test TXT to change', TTL 5400	2026-01-30 15:30:01.924263-05	0	0
+94	6	1	1	admin	Initial User	Added record 'expires1a.expiry3.test TXT target - no timestamp', TTL 5400	2026-02-03 12:02:32.883354-05	0	0
+95	6	1	1	admin	Initial User	Added record 'expires2a.expiry3.test TXT target - expired', TTL 5400, expires at 2026-01-29 14:00	2026-02-03 12:03:09.031474-05	0	0
+96	6	1	1	admin	Initial User	Added record 'expires3a.expiry3.test TXT target - expires soon', TTL 5400, expires at 2026-01-31 14:00	2026-02-03 12:04:30.954558-05	0	0
+97	6	1	1	admin	Initial User	Added record 'expires4a.expiry3.test TXT target - valid soon', TTL 5400, valid after 2026-01-31 14:00	2026-02-03 12:04:52.864866-05	0	0
+98	6	1	1	admin	Initial User	Added record 'expires5a.expiry3.test TXT target - already valid', TTL 5400, valid after 2026-01-29 14:00	2026-02-03 12:05:10.629373-05	0	0
+99	6	1	1	admin	Initial User	Added record 'expires6a.expiry3.test TXT target - valid less soon', TTL 5400, valid after 2026-01-15 18:00	2026-02-03 12:05:31.096289-05	0	0
+100	6	1	1	admin	Initial User	Added record 'expires1b.expiry3.test TXT to change', TTL 5400	2026-02-03 12:05:33.779645-05	0	0
+101	6	1	1	admin	Initial User	Added record 'expires2b.expiry3.test TXT to change', TTL 5400	2026-02-03 12:05:44.12329-05	0	0
+102	6	1	1	admin	Initial User	Added record 'expires3b.expiry3.test TXT to change', TTL 5400	2026-02-03 12:05:50.968888-05	0	0
+103	6	1	1	admin	Initial User	Added record 'expires4b.expiry3.test TXT to change', TTL 5400	2026-02-03 12:05:56.415551-05	0	0
+104	6	1	1	admin	Initial User	Added record 'expires5b.expiry3.test TXT to change', TTL 5400	2026-02-03 12:06:01.591204-05	0	0
+105	6	1	1	admin	Initial User	Added record 'expires6b.expiry3.test TXT to change', TTL 5400	2026-02-03 12:06:34.192183-05	0	0
 \.
 
@@ -808,5 +820,5 @@
 --
 
-SELECT pg_catalog.setval('public.log_log_id_seq', 93, true);
+SELECT pg_catalog.setval('public.log_log_id_seq', 105, true);
 
 
@@ -931,4 +943,16 @@
 6	81	nostamp3b.expiry3.test	16	to change	0	0	0	5400	\N	0		1969-12-31 19:00:00-05	f	f	\N
 6	82	nostamp4b.expiry3.test	16	to change	0	0	0	5400	\N	0		1969-12-31 19:00:00-05	f	f	\N
+6	83	expires1a.expiry3.test	16	target - no timestamp	0	0	0	5400	\N	0		1969-12-31 19:00:00-05	f	f	\N
+6	84	expires2a.expiry3.test	16	target - expired	0	0	0	5400	\N	0		2026-01-29 14:00:00-05	t	t	\N
+6	85	expires3a.expiry3.test	16	target - expires soon	0	0	0	5400	\N	0		2026-01-31 14:00:00-05	t	t	\N
+6	86	expires4a.expiry3.test	16	target - valid soon	0	0	0	5400	\N	0		2026-01-31 14:00:00-05	f	t	\N
+6	87	expires5a.expiry3.test	16	target - already valid	0	0	0	5400	\N	0		2026-01-29 14:00:00-05	f	t	\N
+6	88	expires6a.expiry3.test	16	target - valid less soon	0	0	0	5400	\N	0		2026-01-29 14:00:00-05	f	t	\N
+6	89	expires1b.expiry3.test	16	to change	0	0	0	5400	\N	0		1969-12-31 19:00:00-05	f	f	\N
+6	90	expires2b.expiry3.test	16	to change	0	0	0	5400	\N	0		1969-12-31 19:00:00-05	f	f	\N
+6	91	expires3b.expiry3.test	16	to change	0	0	0	5400	\N	0		1969-12-31 19:00:00-05	f	f	\N
+6	92	expires4b.expiry3.test	16	to change	0	0	0	5400	\N	0		1969-12-31 19:00:00-05	f	f	\N
+6	93	expires5b.expiry3.test	16	to change	0	0	0	5400	\N	0		1969-12-31 19:00:00-05	f	f	\N
+6	94	expires6b.expiry3.test	16	to change	0	0	0	5400	\N	0		1969-12-31 19:00:00-05	f	f	\N
 \.
 
@@ -938,5 +962,5 @@
 --
 
-SELECT pg_catalog.setval('public.records_record_id_seq', 82, true);
+SELECT pg_catalog.setval('public.records_record_id_seq', 94, true);
 
 
Index: branches/cname-collision/t/test-cname-timestamps.sql
===================================================================
--- branches/cname-collision/t/test-cname-timestamps.sql	(revision 1016)
+++ branches/cname-collision/t/test-cname-timestamps.sql	(revision 1017)
@@ -22,2 +22,8 @@
 UPDATE records SET stamp = date_trunc('day', now() - interval '2 day') + '11:30' WHERE record_id = 77;
 UPDATE records SET stamp = date_trunc('day', now() + interval '2 day') + '11:30' WHERE record_id = 78;
+
+UPDATE records SET stamp = date_trunc('day', now() - interval '2 day') + '11:30' WHERE record_id = 84;
+UPDATE records SET stamp = date_trunc('day', now() + interval '2 day') + '11:30' WHERE record_id = 85;
+UPDATE records SET stamp = date_trunc('day', now() + interval '2 day') + '11:30' WHERE record_id = 86;
+UPDATE records SET stamp = date_trunc('day', now() - interval '2 day') + '11:30' WHERE record_id = 87;
+UPDATE records SET stamp = date_trunc('day', now() + interval '5 day') + '11:30' WHERE record_id = 88;
