add entity framework test project
merge code