Should be public ... mock framework changes?