Update mocks to 2.9