Added parent and child field and fixed tests so they wont error due to n...

...ew model.