fixed/redid job_test.py and some cleanup in job.py