Fixed EF tests