Fixed mocks
Merge pull request #26 from pirvudoru/master

Fixed mocks