Added new unit tests.