Reword test names for consistency