updated the unit tests to the JUnit 4 style