Moved Test to the right directory
Merge
Remove unused project and merge