Minor tweaks to style of test