Fixup failing unit tests.