Fixes EOI unit tests