Tests and build.gradle corrected