Fixed some tests.

** Fixed some failing tests.
** Removed typos.