Merge "Shorten long test names"