Removed unused declarations.
Changed a unit test name.