update tests to JUnit4, separate by class