diff -r 33a5d2bbf6fc -r 73a1feb507fb mmsharing/mmshmanagersrv/tsrc/ut_managersrv/group/ut_musmanagerserver.mmp
--- a/mmsharing/mmshmanagersrv/tsrc/ut_managersrv/group/ut_musmanagerserver.mmp	Thu Aug 19 09:51:39 2010 +0300
+++ b/mmsharing/mmshmanagersrv/tsrc/ut_managersrv/group/ut_musmanagerserver.mmp	Tue Aug 31 15:12:07 2010 +0300
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include<eunitcaps.h>
+#include <eunitcaps.h>
 
 TARGET                  ut_musmanagerserver.dll
 TARGETTYPE              dll
@@ -25,7 +25,7 @@
 TARGETPATH              /DigiaEUnit/Tests
 UID                     0x1000af5a 0x01700000
 
-CAPABILITY      EUNIT_CAPS
+CAPABILITY              EUNIT_CAPS
 VENDORID                VID_DEFAULT
 
 MACRO                   UNIT_TESTING
@@ -33,10 +33,8 @@
 SOURCEPATH              ../../../../../tsrc/propertystub/src
 SOURCE                  e32property.cpp
 
-SOURCEPATH              ../../../../../tsrc/apastub/src
-SOURCE                  apgtask.cpp
-SOURCE                  apgcli.cpp
-SOURCE                  apacmdln.cpp
+SOURCEPATH              ../../../../../tsrc/multimediasharingsettingsstub/src
+SOURCE                  mussettings.cpp
 
 SOURCEPATH              ../../../../../tsrc/mmusavasettingsstub/src
 SOURCE                  mmusavasettingsstub.cpp
@@ -52,9 +50,10 @@
 
 
 SOURCEPATH              ../../../../mmshavailability/src
-SOURCE 					        musavasettingsimp.cpp
+SOURCE					musavasettingsimp.cpp
 
 SOURCEPATH              ../src
+SOURCE                  stubs.cpp
 SOURCE                  ut_cmusapplicationmanager.cpp
 SOURCE                  ut_cmusavailabilitypluginmanager.cpp
 SOURCE                  ut_cmusmanagerserverclosetimer.cpp
@@ -73,6 +72,7 @@
 SOURCE                  musmanagerservermain.cpp
 SOURCE                  musmanagerserversession.cpp
 
+USERINCLUDE				../../../../../tsrc/multimediasharingsettingsstub/inc
 USERINCLUDE             ../inc
 USERINCLUDE             ../../../../mmshavailability/inc
 USERINCLUDE             ../../../inc
@@ -101,4 +101,5 @@
 LIBRARY                 ws32.lib
 LIBRARY                 flogger.lib
 LIBRARY                 bafl.lib
+LIBRARY					charconv.lib