Fix System tests refs #6529