overridden restore_object in order to properly support schema mode
renamed DictionaryField in HStoreField
cleaned up tests