MC: fix test locations/name

Placed the MC variant diagnostics in the wrong directory accidentally.  Move
them into their respective architecture specific directories.