Added more unittests.