jobs and tests refactoring