Fixes EOI unit tests
Merge pull request #877 from tgiguere/fix_eoi_test

Fixes EOI unit tests