Merge pull request #751 from bhariharan/unstable

A bunch of Gradle test fixes
Wordsmithing.