Split the methods in TestUtil more and improve naming
Merge pull request #643 from JeroenDeDauw/TestUtill

Split the methods in TestUtil more and improve naming