Fixed unit tests.
Renamed.