Fix tests.
Rename.