Add children querystring to test harness
Code reorganisation