Update main MC CI tests. This will probably need a few iterations and at least reference updates.
/cc @jchapman @nstyles @jcatmore @tsulaia @fwinkl