DataObjectTest bugfixes