Don't mix JUnit 4's @Test with JUnit3's TestCase.
This is the world's most boring merge request. Android Studio was complaining about using JUnit 4's @Test annotations with JUnit 3's TestCase, so I fixed it.
Most of the changes come from Android Studio organising imports in a different order from Eclipse.