Add EventStore tests
Merge origin/master