tests fixup