Changed to JUnit 4
more cleaning