Doc test tweaks