Updated Mcm and fixed tests so they can compile