Re: proposed mock changes (diff)