Upgraded tests to JUnit 4.