Fixes for job tests
Merge pull request #1177 from christav/job-tests-dev

Fixes for job tests