Increased memory for Gradle
Changed test spec a bit to work around a Codenarc bug
Fixed a few Codenarc warnings
Fixed a few Codenarc warnings