Fixed up functional integration check to use Data_Model properties as
appropriate.