add more test
Merge branch 'mocks'