Added new unittests.