Issue 405

I added the missing properties, changed the order of the child properties and added and updated the tests. This should solve Issue #405.