Making test names more consistent