Add the test project to the solution
Merge branch 'master' into Logger