changed schema and created mocks