Moved EF fakes to separate project
Refactor to tidy up a bit