Fixed object graph construction bug, tests pass
Merge