Renaming some tests.