Fixing jobs collection and tests