FIXUP! tests