diff --git a/designer-base/src/test/java/com/fr/design/data/BasicTableDataUtilsTest.java b/designer-base/src/test/java/com/fr/design/data/BasicTableDataUtilsTest.java
index 7391924ac2..a5721a36a6 100644
--- a/designer-base/src/test/java/com/fr/design/data/BasicTableDataUtilsTest.java
+++ b/designer-base/src/test/java/com/fr/design/data/BasicTableDataUtilsTest.java
@@ -50,19 +50,19 @@ public class BasicTableDataUtilsTest extends TestCase {
         TableDataSource source = EasyMock.mock(TableDataSource.class);
         TableData tableData = EasyMock.mock(TableData.class);
         EasyMock.expect(source.getTableData("ds1")).andReturn(tableData).anyTimes();
-        EasyMock.expect(source.getTableData("test-ds1")).andReturn(tableData).anyTimes();
-        EasyMock.expect(source.getTableData("test-ds11")).andReturn(null).anyTimes();
+        EasyMock.expect(source.getTableData("test_ds1")).andReturn(tableData).anyTimes();
+        EasyMock.expect(source.getTableData("test_ds11")).andReturn(null).anyTimes();
         EasyMock.replay(source, tableData);
-        Assert.assertEquals("test-ds1", BasicTableDataUtils.getTableDataName(true, source, "ds1", "test", false));
-        Assert.assertEquals("test-ds11", BasicTableDataUtils.getTableDataName(false, source, "ds1", "test", false));
+        Assert.assertEquals("test_ds1", BasicTableDataUtils.getTableDataName(true, source, "ds1", "test", false));
+        Assert.assertEquals("test_ds11", BasicTableDataUtils.getTableDataName(false, source, "ds1", "test", false));
 
         source = EasyMock.mock(TableDataSource.class);
         EasyMock.expect(source.getTableData("ds1")).andReturn(null).anyTimes();
-        EasyMock.expect(source.getTableData("test-ds1")).andReturn(null).anyTimes();
+        EasyMock.expect(source.getTableData("test_ds1")).andReturn(null).anyTimes();
         EasyMock.replay(source);
-        Assert.assertEquals("test-ds1", BasicTableDataUtils.getTableDataName(true, source, "ds1", "test", false));
+        Assert.assertEquals("test_ds1", BasicTableDataUtils.getTableDataName(true, source, "ds1", "test", false));
         Assert.assertEquals("ds1", BasicTableDataUtils.getTableDataName(false, source, "ds1", "test", false));
-        Assert.assertEquals("test-ds1", BasicTableDataUtils.getTableDataName(false, source, "ds1", "test", true));
+        Assert.assertEquals("test_ds1", BasicTableDataUtils.getTableDataName(false, source, "ds1", "test", true));
 
     }
 
diff --git a/designer-base/src/test/java/com/fr/design/data/DesignTableDataManagerTest.java b/designer-base/src/test/java/com/fr/design/data/DesignTableDataManagerTest.java
index 9a5ce7b8c1..1a23555f61 100644
--- a/designer-base/src/test/java/com/fr/design/data/DesignTableDataManagerTest.java
+++ b/designer-base/src/test/java/com/fr/design/data/DesignTableDataManagerTest.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({TableDataFactory.class, StoreProcedure.class, TableDataConfig.class, ProcedureConfig.class})
+@PrepareForTest({TableDataFactory.class, StoreProcedure.class, TableDataConfig.class, ProcedureConfig.class, TemplateTableDataWrapper.class})
 @SuppressStaticInitializationFor({"com.fr.design.data.tabledata.wrapper.TableDataFactory"})
 public class DesignTableDataManagerTest {