Rework int/dist addition to MP test