Added more tests and updated EF