Refactor surrogate MockCharacter