Upgraded to Gradle and Robolectric