Better support for Java tests