switch to JUnit4, cleanup code