Update ProjectInfo.xml for unit test
Synchonize project files
Fix compilation erorrs