Mock fixes and an example.

@loganj @edenman