Merge pull request #457 from farismosman/master

[#Fixing failing tests]
[#Refactoring] Faris: Moved api_edit_child and api_create_child features into one file.