Final fixes to unittests.