Formatting tweaks to tests