--- a/kerneltest/f32test/server/t_cp_plugin.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/f32test/server/t_cp_plugin.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -16,7 +16,6 @@
 //
 
 
-#define __E32TEST_EXTENSION__
 #include <f32file.h>
 #include <e32ldr.h>
 #include <e32ldr_private.h>
@@ -43,6 +42,8 @@
 void TestCompatibility();
 void TestINC126563();
 
+// Codepage dll name
+_LIT(KCP932Name,"T_CP932");
 
 TInt LoadCodePageDll(const TDesC& aCodePageDllName)
 	{
@@ -94,8 +95,7 @@
 	test.Start(_L("Starting T_CP_PLUGIN tests"));
 
 #if defined(_DEBUG) || defined(_DEBUG_RELEASE)
-	// Codepage dll name
-	_LIT(KCP932Name,"T_CP932");
+
 	// Test only runs on Fat file systems
 	TheFs.SessionPath(gSessionPath);
 	TInt driveNum = CurrentDrive();
@@ -111,13 +111,13 @@
 			{
 			TBuf<16> CodepageDllName(KCP932Name);
 			r = LoadCodePageDll(CodepageDllName);
-			test_Value(r, r == KErrNone || r == KErrAlreadyExists);
+			test(r == KErrNone || r == KErrAlreadyExists);
 
 			if(r == KErrNone)
 				{
 				// should not allow loading again codepage dll.
 				r = LoadCodePageDll(CodepageDllName);
-				test_Value(r, r == KErrAlreadyExists);
+				test(r == KErrAlreadyExists);
 
 				}
 
@@ -129,7 +129,7 @@
 
 			// Disables codepage dll implementation of LocaleUtils functions for other base tests
 			r = TheFs.ControlIo(driveNum, KControlIoDisableFatUtilityFunctions);
-			test_KErrNone(r);
+			test(r == KErrNone);
 			}
 		}
 	else