Renaming some tests for clarity.