Fix broken unittests.