Rename some tests in preparation for adding more tests.