Update some test to Junit 4.0