Fix EF tests