JUnit test cleanup