Further tweaks to test