modified TestData generation