Amended Gradle config
Renamed the tests
Updated Gradle Android Plugin