Update Object parsing and tests