EventStorage tests and small bugfix