FIXUP - tests