Convert to JUnit tests