Split the methods in TestUtil more and improve naming