Use separate test types for Java DSL and XML tests