Changes to add child container tests