Minor renaming of tests.