fixed bug introduced in last update... run tests!

also updated tests to match changes where 'children' override is allowed
Merge pull request #47 from tisdall/master

fixed bug introduced in last update... run tests!