Still waiting on https://issues.gradle.org/browse/GRADLE-2966
So atm I still cannot fold hibernate-testing back into hibernate-core. Other than that, I think the clean up is done..