Restructured test objects to auto add/run children