Tweak a couple of tests broken by recent tweaks to the YV work