Fixed EOI unit tests
Merge pull request #583 from tgiguere/fix_eoi_tests

Fixed EOI unit tests