T897-0 Custom effort + test fixes + fix import estimation suite