Refactoring DTO, EventEntity, Test