Fixed broken unittests.