Moved from tests.
Moved.
Fixed typos.