Fix unittests.
Minor cleanup.