fixup! Fix unit tests