Fixes for job tests

Targeting correct branch for merge. Already reviewed as PR #1176