Updated the data object classes to be compatible with Test Factory 2.2.