[#54239366] Fix test failures caused by changing the way we order job_tasks