Fixup: tests