Added TestDataObject and DataObject to replace RawData