Updating tests to work with gradle

Tests are now run with `gradle connectedInstrumentTest`