Tidy names of tests to be more consistent (especially in test() output)
Merge pull request #88 from ajdm/tests

Tidy names of tests to be more consistent (especially in test() output)