Fix mv_register test and all that that broke