More work on JUnit integration.