Renaming a few test names for clarity