Task child test cases (round 1) plus renames some test cases