diff -r 33a5d2bbf6fc -r 73a1feb507fb mmshplugins/mmshaiwplugin/tsrc/ut_aiwplugin/group/ut_musaiwprovider.mmp
--- a/mmshplugins/mmshaiwplugin/tsrc/ut_aiwplugin/group/ut_musaiwprovider.mmp	Thu Aug 19 09:51:39 2010 +0300
+++ b/mmshplugins/mmshaiwplugin/tsrc/ut_aiwplugin/group/ut_musaiwprovider.mmp	Tue Aug 31 15:12:07 2010 +0300
@@ -17,7 +17,7 @@
 
 // To get the APP_LAYER_SYSTEMINCLUDE-definition
 #include <platform_paths.hrh>
-#include<eunitcaps.h>
+#include <eunitcaps.h>
 
 TARGET                  ut_musaiwprovider.dll
 TARGETTYPE              dll
@@ -25,7 +25,7 @@
 TARGETPATH              /z/sys/bin
 UID                     0x1000af5a 0x01700a22
 
-CAPABILITY      EUNIT_CAPS
+CAPABILITY              EUNIT_CAPS
 VENDORID                VID_DEFAULT
 
 MACRO                   UNIT_TESTING
@@ -47,8 +47,11 @@
 SOURCEPATH              ../../../../../tsrc/featmgrstub/src
 SOURCE                  FeatMgr.cpp
 
+SOURCEPATH              ../../../../../tsrc/propertystub/src
+SOURCE		            e32property.cpp
+
 SOURCEPATH              ../../../../../tsrc/musmanagerstub/src
-SOURCE    		musmanagerstub.cpp
+SOURCE    				musmanagerstub.cpp
 // Test classes
 SOURCEPATH              ../src
 SOURCE                  ut_musaiwproviderdllmain.cpp
@@ -60,13 +63,27 @@
 SOURCE                  musaiwprovider.cpp
 
 
+// Centrep Stub
+SOURCEPATH              ../../../../../tsrc/centralrepositorystub/src
+SOURCE                  centralrepositorystub.cpp
+
+
+// Stup User Includes
+USERINCLUDE             ../../../../../tsrc/resourcefilestub/inc
+USERINCLUDE             ../../../../../tsrc/propertystub/inc
+USERINCLUDE             ../../../../../tsrc/centralrepositorystub/inc
+
+// Actual User Includes
 USERINCLUDE             ../inc
-USERINCLUDE				      ../../../inc
+USERINCLUDE				../../../inc
+
+// Test Includes.
 USERINCLUDE             ../../../../../tsrc/musmanagerstub/inc
 USERINCLUDE             ../../../../../tsrc/ututils/inc
 USERINCLUDE             ../../../../../inc
 USERINCLUDE             ../../../../../tsrc/Apastub/inc
-USERINCLUDE             ../../../../../tsrc/resourcefilestub/inc
+USERINCLUDE             ../../../../../tsrc/featmgrstub/inc
+
 
 
 // to replace FeatMgr.h with a stub
@@ -78,6 +95,12 @@
 // to replace barsc.h with a stub
 SYSTEMINCLUDE           ../../../../../tsrc/resourcefilestub/inc
 
+// to replace RProperty with a stub
+SYSTEMINCLUDE           ../../../../../tsrc/propertystub/inc
+
+// Centrep stub
+SYSTEMINCLUDE             ../../../../../tsrc/centralrepositorystub/inc
+
 // Default system include paths for application layer modules.
 APP_LAYER_SYSTEMINCLUDE
 
@@ -93,8 +116,7 @@
 LIBRARY                 eikcore.lib
 LIBRARY                 eunit.lib
 LIBRARY                 charconv.lib
-LIBRARY                 centralrepository.lib
-
+//LIBRARY                 centralrepository.lib
 LIBRARY                 flogger.lib
 LIBRARY                 servicehandler.lib // AIW Consumer API