Added parent and child field and fixed tests so they wont error due to new model.
Merge pull request #139 from pachalad/master

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