Updated some unittests.