Jobs and tests failure fix