* Added the test project to the solution

* Fixed solution folders