EF tests updated