diff --git a/test/org/test/zlibrary/model/TestTextControlEntry.java b/test/org/test/zlibrary/model/TestTextControlEntry.java
index d6e79db45..35dc7d3bd 100644
--- a/test/org/test/zlibrary/model/TestTextControlEntry.java
+++ b/test/org/test/zlibrary/model/TestTextControlEntry.java
@@ -1,7 +1,9 @@
 package org.test.zlibrary.model;
 
-import org.zlibrary.model.entry.ZLTextControlEntry;
+import org.zlibrary.model.ZLTextParagraphEntry;
 import org.zlibrary.model.impl.ZLModelFactory;
+import org.zlibrary.model.impl.ZLTextControlEntryImpl;
+
 import junit.framework.TestCase;
 
 public class TestTextControlEntry extends TestCase {
@@ -10,7 +12,7 @@ public class TestTextControlEntry extends TestCase {
 	public void test() {
         boolean start = true;
         byte kind = (byte)0;
-        ZLTextControlEntry entry = factory.createControlEntry(kind, start);
+        ZLTextControlEntryImpl entry = factory.createControlEntry(kind, start);
         assertEquals(entry.getKind(), kind);
         assertEquals(entry.isStart(), start);
     }
diff --git a/test/org/test/zlibrary/model/TestTextControlEntryPool.java b/test/org/test/zlibrary/model/TestTextControlEntryPool.java
index fef541624..c1d4c0772 100644
--- a/test/org/test/zlibrary/model/TestTextControlEntryPool.java
+++ b/test/org/test/zlibrary/model/TestTextControlEntryPool.java
@@ -2,7 +2,7 @@ package org.test.zlibrary.model;
 
 import junit.framework.TestCase;
 import org.zlibrary.model.entry.ZLTextControlEntryPool;
-import org.zlibrary.model.entry.ZLTextParagraphEntry;
+import org.zlibrary.model.ZLTextParagraphEntry;
 import org.zlibrary.model.impl.ZLModelFactory;
 
 public class TestTextControlEntryPool extends TestCase {
diff --git a/test/org/test/zlibrary/model/TestTextEntry.java b/test/org/test/zlibrary/model/TestTextEntry.java
index 8c5fcd511..07ba0e5af 100644
--- a/test/org/test/zlibrary/model/TestTextEntry.java
+++ b/test/org/test/zlibrary/model/TestTextEntry.java
@@ -1,7 +1,7 @@
 package org.test.zlibrary.model;
 
 import junit.framework.TestCase;
-import org.zlibrary.model.entry.ZLTextEntry;
+import org.zlibrary.model.impl.ZLTextEntryImpl;
 import org.zlibrary.model.impl.ZLModelFactory;
 
 public class TestTextEntry extends TestCase {
@@ -9,7 +9,7 @@ public class TestTextEntry extends TestCase {
 
     public void test() {
         String str = "marina";
-        ZLTextEntry entry = factory.createTextEntry(str);
+        ZLTextEntryImpl entry = factory.createTextEntry(str);
         assertEquals(entry.getData(), str);
         assertEquals(entry.getDataLength(), str.length());
     }
diff --git a/test/org/test/zlibrary/model/TestZLTextModel.java b/test/org/test/zlibrary/model/TestZLTextModel.java
index da1d8905e..2025eea20 100644
--- a/test/org/test/zlibrary/model/TestZLTextModel.java
+++ b/test/org/test/zlibrary/model/TestZLTextModel.java
@@ -3,8 +3,8 @@ package org.test.zlibrary.model;
 import junit.framework.TestCase;
 import org.zlibrary.model.ZLTextModel;
 import org.zlibrary.model.ZLTextParagraph;
-import org.zlibrary.model.entry.ZLTextEntry;
 import org.zlibrary.model.impl.ZLModelFactory;
+import org.zlibrary.model.impl.ZLTextEntryImpl;
 
 public class TestZLTextModel extends TestCase {
     private ZLModelFactory factory = new ZLModelFactory(); 
@@ -28,12 +28,12 @@ public class TestZLTextModel extends TestCase {
         assertEquals(model.getParagraphsNumber(), 2);
         assertEquals(model.getParagraph(0), paragraph);
         model.addText("addText");
-        assertEquals(((ZLTextEntry)model.getParagraph(1).getEntries().get(0)).getData(), "addText");
+        assertEquals(((ZLTextEntryImpl)model.getParagraph(1).getEntries().get(0)).getData(), "addText");
         StringBuffer sb = new StringBuffer();
         sb.append("1");
         sb.append("2");
         model.addText(sb);
-        assertEquals(((ZLTextEntry)model.getParagraph(1).getEntries().get(1)).getData(), "12");
+        assertEquals(((ZLTextEntryImpl)model.getParagraph(1).getEntries().get(1)).getData(), "12");
     }
 
     public void testAddControl() {