Fixup unit-tests.