JUnit classes updated