Replace row map with IDfTypedObject.  Improved unit tests