More test style tweaks