Updates.

* Updated tests.
* Made fixes.