moved references assignments to DataTags in TestValidate for more consistency