Sorted out job progress duplication

Need to get job state test assertions right though...