Add intention to convert JUnit 3 to 4+Hamcrest. Move methods to util class.