Refactoring of TestUtil and all test classes