Minor renaming of test.
Fix tests.