move tests to the same folder and adding chages to event.py and event_test.py