Minor improvements to tests

I hope you can review this diff in a nicer way than the GitHub default, which seems distinctly inferior to Crucible. I don't seem to be able to add comments to individual changes, but hopefully most of them are obvious - come and grab me for an explanation of any that seem odd (whether or not you decide to actually merge them in).