upgraded tests to JUnit test suite