Added unit tests.
Updated unit tests.