Fixup dependent tests