Fixed a couple of test names to be (mostly) consistent.
Merged pull request #440