[DDC-3076] Fix ObjectHydrator
[DDC-3076] Add/Improve tests