Merge "Add test for CM#setAvoidUnvalidated"