Fixed EOI unit tests

Fixed unit tests in EOI data handlers