Add mocks for Mohit's mapper