Update groovy and gradle.  Fix test name.  Strongly type some things.