Update for _.mdm and test cases