Fix gradle build. One test still fails.