Patches some tests (EOI) to ensure correct dataset creation.