Working towards new mocks