Added some common internal tasks for the two test tasks.