Neatened test cleanup.