fixed the mock
Merge remote-tracking branch 'origin/feature/basicImplementation' into feature/geteventstore