Done: Fix existing unittests.