Mostly cosmetic changes, and a couple of new tests

Hi Brian,

Before thinking about any deeper changes to this codebase, I did a quick once-over on all the files.

This PR is just clarifying the existing code, standardizing on common test naming (drop the "should" from the titles), extracting common values, removing unnecessary braces, etc.

Could you review this pull request, and merge if you are ok with the changes?

Thanks,
-Marc