Handle toplevel with children tests better in archiving