add mocks
Merge pull request #1080 from matiu/bug/add-mocks

add mocks