Fixed tests and job_generator