Merge "Fix DMSTests" into main