Use DataHelper instead of TestUtils