Tests, EF

Made tests, small changes in EF