Some more test tweaks