Add surrogate to mock classes