Added tests and job controller methods