More test tweaks