Tweak test timing; unmount-chroot is still an issue.