Some tidy work on the Job class and its tests