diff --git src/org/eclipse/equinox/bidi/internal/tests/STextExtensionsTest.java src/org/eclipse/equinox/bidi/internal/tests/STextExtensionsTest.java
index a9d9f04..6f010b2 100644
--- src/org/eclipse/equinox/bidi/internal/tests/STextExtensionsTest.java
+++ src/org/eclipse/equinox/bidi/internal/tests/STextExtensionsTest.java
@@ -216,7 +216,7 @@
 
 		processor = STextProcessorFactory.PROC_EMAIL;
 		state[0] = STextEngine.STATE_INITIAL;
-		assertEquals("<>.:,;@", processor.getSeparators(null, "", null));
+		assertEquals("<>.:,;@", processor.getSeparators(null));
 		doTest3("DelimsEsc #1", "abc.DEF.GHI", "abc.DEF@.GHI");
 		doTest3("DelimsEsc #2", "DEF.GHI (A:B);JK ", "DEF@.GHI @(A:B)@;JK ");
 		doTest3("DelimsEsc #3", "DEF.GHI (A:B);JK ", "DEF@.GHI @(A:B)@;JK ");
diff --git src/org/eclipse/equinox/bidi/internal/tests/STextMethodsTest.java src/org/eclipse/equinox/bidi/internal/tests/STextMethodsTest.java
index cb9b589..3c09385 100644
--- src/org/eclipse/equinox/bidi/internal/tests/STextMethodsTest.java
+++ src/org/eclipse/equinox/bidi/internal/tests/STextMethodsTest.java
@@ -12,7 +12,7 @@
 package org.eclipse.equinox.bidi.internal.tests;
 
 import org.eclipse.equinox.bidi.*;
-import org.eclipse.equinox.bidi.custom.STextDirections;
+import org.eclipse.equinox.bidi.custom.STextCharTypes;
 import org.eclipse.equinox.bidi.custom.STextProcessor;
 
 /**
@@ -35,18 +35,22 @@
 
 	class MyComma extends STextProcessor {
 
-		public String getSeparators(STextEnvironment environment, String text, STextDirections dirProps) {
+		public String getSeparators(STextEnvironment environment) {
 			return ","; //$NON-NLS-1$
 		}
 
-		public boolean skipProcessing(STextEnvironment environment, String text, STextDirections dirProps) {
+		public boolean skipProcessing(STextEnvironment environment, String text, STextCharTypes dirProps) {
 			byte dirProp = dirProps.getBidiTypeAt(0);
 			if (dirProp == AL)
 				return true;
 			return false;
+		}
+
+		public int getDirection(STextEnvironment environment, String text) {
+			return getDirection(environment, text, new STextCharTypes(text));
 		}
 
-		public int getDirection(STextEnvironment environment, String text, STextDirections dirProps) {
+		public int getDirection(STextEnvironment environment, String text, STextCharTypes dirProps) {
 			for (int i = 0; i < text.length(); i++) {
 				byte dirProp = dirProps.getBidiTypeAt(i);
 				if (dirProp == AL)
@@ -187,18 +191,18 @@
 		dirHebrew = LTR;
 		msg = "TestDirection #1";
 		String text = toUT16("###");
-		dirA = processor.getDirection(null, text, new STextDirections(text));
+		dirA = processor.getDirection(null, text);
 		text = toUT16("ABC");
-		dirH = processor.getDirection(null, toUT16("ABC"), new STextDirections(text));
+		dirH = processor.getDirection(null, toUT16("ABC"));
 		assertTrue(msg, dirA == RTL && dirH == LTR);
 
 		dirArabic = RTL;
 		dirHebrew = RTL;
 		msg = "TestDirection #2";
 		text = toUT16("###");
-		dirA = processor.getDirection(null, text, new STextDirections(text));
+		dirA = processor.getDirection(null, text);
 		text = toUT16("ABC");
-		dirH = processor.getDirection(null, text, new STextDirections(text));
+		dirH = processor.getDirection(null, text);
 		assertTrue(msg, dirA == RTL && dirH == RTL);
 
 		dirArabic = dirHebrew = LTR;
@@ -218,9 +222,9 @@
 		dirArabic = RTL;
 		msg = "TestDirection #10.5";
 		text = toUT16("###");
-		dirA = processor.getDirection(null, text, new STextDirections(text));
+		dirA = processor.getDirection(null, text);
 		text = toUT16("ABC");
-		dirH = processor.getDirection(null, text, new STextDirections(text));
+		dirH = processor.getDirection(null, text);
 		assertTrue(msg, dirA == RTL && dirH == LTR);
 		STextEnvironment environment = new STextEnvironment(null, true, STextEnvironment.ORIENT_LTR);
 		data = "ABC,#DEF,HOST,com";
diff --git src/org/eclipse/equinox/bidi/internal/tests/STextSomeMoreTest.java src/org/eclipse/equinox/bidi/internal/tests/STextSomeMoreTest.java
index 4e64ee8..e10dd73 100644
--- src/org/eclipse/equinox/bidi/internal/tests/STextSomeMoreTest.java
+++ src/org/eclipse/equinox/bidi/internal/tests/STextSomeMoreTest.java
@@ -13,7 +13,7 @@
 
 import org.eclipse.equinox.bidi.STextEngine;
 import org.eclipse.equinox.bidi.STextEnvironment;
-import org.eclipse.equinox.bidi.custom.STextDirections;
+import org.eclipse.equinox.bidi.custom.STextCharTypes;
 import org.eclipse.equinox.bidi.custom.STextProcessor;
 
 /**
@@ -27,15 +27,15 @@
 
 	class Processor1 extends STextProcessor {
 
-		public int getSpecialsCount(STextEnvironment env, String text, STextDirections dirProps) {
+		public int getSpecialsCount(STextEnvironment env) {
 			return 1;
 		}
 
-		public int indexOfSpecial(STextEnvironment env, String text, STextDirections dirProps, int[] offsets, int caseNumber, int fromIndex) {
+		public int indexOfSpecial(STextEnvironment env, String text, STextCharTypes dirProps, int[] offsets, int caseNumber, int fromIndex) {
 			return fromIndex;
 		}
 
-		public int processSpecial(STextEnvironment env, String text, STextDirections dirProps, int[] offsets, int[] state, int caseNumber, int separLocation) {
+		public int processSpecial(STextEnvironment env, String text, STextCharTypes dirProps, int[] offsets, int[] state, int caseNumber, int separLocation) {
 			int len = text.length();
 			for (int i = len - 1; i >= 0; i--) {
 				STextProcessor.insertMark(text, dirProps, offsets, i);
@@ -47,7 +47,7 @@
 
 	class Processor2 extends STextProcessor {
 
-		public int getSpecialsCount(STextEnvironment env, String text, STextDirections dirProps) {
+		public int getSpecialsCount(STextEnvironment env) {
 			return 1;
 		}
 
@@ -55,11 +55,11 @@
 
 	class Processor3 extends STextProcessor {
 
-		public int getSpecialsCount(STextEnvironment env, String text, STextDirections dirProps) {
+		public int getSpecialsCount(STextEnvironment env) {
 			return 1;
 		}
 
-		public int indexOfSpecial(STextEnvironment env, String text, STextDirections dirProps, int[] offsets, int caseNumber, int fromIndex) {
+		public int indexOfSpecial(STextEnvironment env, String text, STextCharTypes dirProps, int[] offsets, int caseNumber, int fromIndex) {
 			return fromIndex;
 		}
 	}