migration to JUnit 4 - test cleanup