Why did you change this from a message expectation to a stub?  IMO, `and_call_original` doesn't really make sense with a stub, given that the `and_call_original` is only possible on a partial mock, and it would call the original normally anyway....