Added tests for Job, reformatted Job code