Make test names more consistent