Updated test to use children() instead of the deprecated child()
Merge remote-tracking branch 'origin/master' into issue235