add related items back

and sneak a test fix in.