--- a/mmsharing/mmshavailability/tsrc/ut_availability/Group/ut_availability.mmp	Tue Aug 31 15:12:07 2010 +0300
+++ b/mmsharing/mmshavailability/tsrc/ut_availability/Group/ut_availability.mmp	Wed Sep 01 12:31:01 2010 +0100
@@ -27,8 +27,8 @@
 MACRO                   UNIT_TESTING
 //epocallowdlldata 
 
+CAPABILITY      EUNIT_CAPS
 
-CAPABILITY              EUNIT_CAPS
 VENDORID                VID_DEFAULT
 
 // Test sources
@@ -59,8 +59,7 @@
 SOURCE                  UT_CMusAvaSipprofileAvailability.cpp
 SOURCE                  UT_CMusAvaSipProfileRegistryObserver.cpp
 SOURCE                  UT_CMusAvaNetworkAvailability.cpp
-SOURCE                  UT_CMusAvaSettingAvailability.cpp
-SOURCE					UT_CMusAvaCallEventMonitor.cpp    
+SOURCE                  UT_CMusAvaSettingAvailability.cpp    
 SOURCE                  UT_CMusAvaSipheaderUtil.cpp
 SOURCE                  ut_cmusavaclientresolverutil.cpp  
 SOURCE                  musavacapabilitytesthelper.cpp
@@ -127,8 +126,7 @@
 SOURCE                  centralrepositorystub.cpp
 SOURCE                  sipprofileregistrystub.cpp
 SOURCE                  sipprofilestub.cpp
-SOURCE					csipcontactheaderstub.cpp
-SOURCE					musavacallmonitorobserver.cpp
+SOURCE			csipcontactheaderstub.cpp
 SOURCE                  muscallmonitorstub.cpp
 
 SOURCEPATH              ../../../../../tsrc/sipprofilestub/src
@@ -149,6 +147,7 @@
 SOURCEPATH              ../../../../../mmshplugins/mmshaoplugin/src
 SOURCE                  muscalleventmonitor.cpp
 SOURCE                  muscallmonitor.cpp
+SOURCE                  musclirmonitor.cpp
 
 //SOURCE                  musconferencecallmonitor.cpp
 // Using RProperty Stubs
@@ -169,16 +168,12 @@
 USERINCLUDE             ../../../../../mmshplugins/mmshaoplugin/inc
 USERINCLUDE             ../../../../../tsrc/propertystub/inc
 USERINCLUDE             ../../../../../tsrc/sipclientstub/inc
-USERINCLUDE             ../../../../../tsrc/musavaailabilitystub/inc
-USERINCLUDE             ../../../../../tsrc/centralrepositorystub/inc
-USERINCLUDE             ../../../../../tsrc/sipprofilestub/inc
 
 SYSTEMINCLUDE           ../../../../../tsrc/sipprofilestub/inc
 SYSTEMINCLUDE           ../../../../../tsrc/sipclientstub/inc
 SYSTEMINCLUDE           ../../../../../tsrc/musavaailabilitystub/inc
 SYSTEMINCLUDE           ../../../../../tsrc/centralrepositorystub/inc
 SYSTEMINCLUDE           ../../../../../tsrc/propertystub/inc
-SYSTEMINCLUDE           /epoc32/include/platform/digia/eunit
 
 APP_LAYER_SYSTEMINCLUDE
 
@@ -199,6 +194,7 @@
 LIBRARY                 insock.lib
 LIBRARY                 sdpcodec.lib
 LIBRARY                 sipcodec.lib
+LIBRARY                 PbkEng.lib
 LIBRARY                 connmon.lib
 LIBRARY                 etelmm.lib
 LIBRARY                 etel.lib