A bunch of Gradle test fixes