Corrected internals and tests for using eventstore-client

S-47060