Merge "Shorten test names to be under 100 chars." into main