I assume it is only UnitTest where the job['id'] is required.  How do you suggest to change the unittest job structure so that it has job['jobid'] instead of job['id'] ?