--- a/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuiteServer.cpp	Fri Mar 19 09:55:57 2010 +0200
+++ b/smsprotocols/smsstack/wapprot/test/Te_wapprot/WapProtSuiteServer.cpp	Fri Apr 16 16:12:37 2010 +0300
@@ -16,15 +16,16 @@
 //
 
 /**
- @file
+    @file
+    @test
 */
 
 // Include your own server header file and step header file(s) here
 #include "WapProtSuiteServer.h"
+
 #include "WapIoctlSteps.h"
 #include "WapStatusReports.h"
 
-
 CWapProtSuite* CWapProtSuite::NewL()
 /**
  *  @return - Instance of the test server
@@ -33,19 +34,21 @@
  *  CTestServer derived server.
  */
 	{
-	CWapProtSuite * server = new (ELeave) CWapProtSuite();
+	CWapProtSuite* server = new (ELeave) CWapProtSuite();
 	CleanupStack::PushL(server);
-	// CServer base class call
-	
-	RProcess	handle = RProcess();
-	TParsePtrC	serverName(handle.FileName());
+
+    // CSmsStackTestServer intermediate base class call
+    server->InitializeTsyAndPhonesL();
+    
+    // CServer base class call
+    RProcess    handle = RProcess();
+    TParsePtrC  serverName(handle.FileName());
 	server->ConstructL(serverName.Name());
 	
 	CleanupStack::Pop(server);
 	return server;
 	}
 
-
 LOCAL_C void MainL()
 	{
 	CActiveScheduler* sched=NULL;
@@ -255,10 +258,6 @@
 	else if (aStepName == _L("ReceiveWapMessage"))
 		{
 		testStep = new CReceiveWapMessage();
-		}		
-	else if (aStepName == _L("InitializePhone"))
-		{
-		testStep = new CInitializePhone();
 		}
 	else if (aStepName == _L("TestEnumeratingVCard"))
 		{
@@ -272,11 +271,11 @@
 		{
 		testStep = new CTestOversizedDatagram();
 		}
- 	else if (aStepName == _L("TestWapDatagramSegmentContainingNoData"))
- 	    {
- 	    testStep = new CTestWapDatagramSegmentContainingNoData();
- 	    }
-		
+	else if (aStepName == _L("TestWapDatagramSegmentContainingNoData"))
+        {
+        testStep = new CTestWapDatagramSegmentContainingNoData();
+        }
+	
 	//
 	// Set the test step name here to save code!!!
 	//