Make test names consistent