Minor tweaks to test