Work

- Replaced command line test project by Unit Test project
- Work on Server