Merge "Fix Dx tests."