Have Mocks implement Mock
Merged from origin