Collapse test.{unit,integration} into org.elasticsearch.