updated tests based on JUnit4
updated JavaDoc