refactoring for consistent variable naming
improve tests for Event data model