updated tests to Junit 4