Fix events recognition
Fix all events behaviour
Fix states main testcases
Fix states & events tests