--- a/epoc32/include/mw/siptransactionbase.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/mw/siptransactionbase.h	Wed Mar 31 12:33:34 2010 +0100
@@ -2,9 +2,9 @@
 * Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
@@ -27,7 +27,6 @@
 // INCLUDES
 #include <e32base.h>
 #include <stringpool.h>
-#include "_sipcodecdefs.h"
 
 // FORWARD DECLARATIONS
 class CSIPResponseElements;
@@ -217,14 +216,16 @@
         CSIPResponseElements* iResponseElements;
 
 	private: // For testing purposes
-	    UNIT_TEST(CSIP_Test)
-        UNIT_TEST(CSIPServerTransaction_Test)
-        UNIT_TEST(CSIPSubscribeDialogAssoc_Test)
-        UNIT_TEST(CSIPInviteDialogAssoc_Test)
-        UNIT_TEST(CSIPNotifyDialogAssoc_Test)
-        UNIT_TEST(CSIPConnection_Test)
+#ifdef CPPUNIT_TEST
+	    friend class CSIP_Test;
+        friend class CSIPServerTransaction_Test;
+        friend class CSIPSubscribeDialogAssoc_Test;
+        friend class CSIPInviteDialogAssoc_Test;
+        friend class CSIPNotifyDialogAssoc_Test;
+        friend class CSIPConnection_Test;
+#endif
+		void __DbgTestInvariant() const;
 
-        __DECLARE_TEST;
     };
 
 #endif