Rewrite test to use JUnit 4