Change mocks to use new style; stub is deprecated