Merge "Refactor job-test params"