Fix the MS Tests