Merge "new tests for job dir"