Better handle nesting of strings in children
Tweak tests