Cleaning up DefaultJobImpl and tests