improve TestUtil