diff -r 73a1feb507fb -r bc78a40cd63c mmsharing/mmshengine/tsrc/ut_engine/src/ut_musenginedllmain.cpp
--- a/mmsharing/mmshengine/tsrc/ut_engine/src/ut_musenginedllmain.cpp	Tue Aug 31 15:12:07 2010 +0300
+++ b/mmsharing/mmshengine/tsrc/ut_engine/src/ut_musenginedllmain.cpp	Wed Sep 01 12:31:01 2010 +0100
@@ -16,6 +16,7 @@
 */
 
 //  USER INCLUDES
+#include "ut_musengsession.h"
 #include "ut_musengmcesession.h"
 #include "ut_musengoutsession.h"
 #include "ut_musenglivesession.h"
@@ -26,14 +27,7 @@
 #include "ut_musengtelephoneutils.h"
 #include "ut_musenguriparser.h"
 #include "ut_musengsipprofilehandler.h"
-#include "ut_musengsessionmanager.h"
-#include "ut_musengtwowaysession.h"
-#include "ut_musengtwowayrecvsession.h"
-#include "ut_musengcamerahandler.h"
-#include "ut_musenglivevideoplayer.h"
-#include "ut_musengremotevideoplayer.h"
-#include "ut_musengclipvideoplayer.h"
-#include "ut_muspropertywatch.h"
+#include "ut_musengorientationhandler.h"
 
 
 //  SYSTEM INCLUDES
@@ -46,24 +40,19 @@
 //
 EXPORT_C MEUnitTest* CreateTestSuiteL()
     {
+    
     CEUnitTestSuite* rootSuite = CEUnitTestSuite::NewLC( _L( "Mush Engine" ) );
 
-    rootSuite->AddL( UT_CMusEngClipVideoPlayer::NewLC() );
-    CleanupStack::Pop();
-    
     rootSuite->AddL( UT_CMusEngSipProfileHandler::NewLC() );
     CleanupStack::Pop();
 
-    rootSuite->AddL( UT_CMusEngLiveVideoPlayer::NewLC() );
-    CleanupStack::Pop();  
-
-    rootSuite->AddL( UT_CMusEngRemoteVideoPlayer::NewLC() );
-    CleanupStack::Pop();    
-    
     rootSuite->AddL( UT_MusEngMceUtils::NewLC() );
     CleanupStack::Pop();
     
     rootSuite->AddL( UT_CMusEngSessionDurationTimer::NewLC() );
+    CleanupStack::Pop();
+
+    rootSuite->AddL( UT_CMusEngSession::NewLC() );
     CleanupStack::Pop();  
     
     rootSuite->AddL( UT_CMusEngMceSession::NewLC() );
@@ -81,27 +70,15 @@
     rootSuite->AddL( UT_CMusEngClipSession::NewLC() );
     CleanupStack::Pop();      
     
-    rootSuite->AddL( UT_CMusEngTwoWaySession::NewLC() );
-    CleanupStack::Pop();  
-    
-    rootSuite->AddL( UT_CMusEngTwoWayRecvSession::NewLC() );
-    CleanupStack::Pop();  
-    
-    rootSuite->AddL( UT_TMusEngCameraHandler::NewLC() );
-    CleanupStack::Pop();
-        
     rootSuite->AddL( UT_CMusEngTelephoneUtils::NewLC() );
     CleanupStack::Pop();      
- 
+    
     rootSuite->AddL( UT_TMusEngUriParser::NewLC() );
-    CleanupStack::Pop();
+    CleanupStack::Pop();     
     
-    rootSuite->AddL( UT_CMusEngSessionManager::NewLC() );
-    CleanupStack::Pop();  
-     
-    rootSuite->AddL( UT_CMusPropertyWatch::NewLC() );
-    CleanupStack::Pop();
-    
+    rootSuite->AddL( UT_CMusEngOrientationHandler::NewLC() );
+    CleanupStack::Pop();     
+
     CleanupStack::Pop( rootSuite );
 
     return rootSuite;