Revise EOF problems, add tests for fire event