Fake repository and QueryHandlers done
Merged sln conflicts