Fixed job tests

Fixes for TFS ID 1455893