Simplify jackknifed shift predictor of coherence
Fix tests for regressions in Base