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