Fix failing tests and fix warnings

Test: Some tests were failing after switching to a new UAST;
      change back to previous version.
Change-Id: Id4b1ddaa9c3aa839a51480b2f0a19e2a42158992
diff --git a/gradle.properties b/gradle.properties
index 8998b2f..e1841e4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,4 @@
+# suppress inspection "UnusedProperty" for whole file
 org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=1024m
 org.gradle.daemon=true
 kotlin.incremental.usePreciseJavaTracking=true