TRUNK-4146:change the test case and test data set