Move doi mocks to cli and fix them