Cleaned up Gradle files.
Worked out some Espresso issues.