Updated EF test