Merge "Update missed ECM Settings tests" into main