Few more tests and changes to Gradle props