Reverting to before ee3a4b09cb4ce6bdb97826a083145e4a1b63e11b
JUnit4 does not seem to work. The included JUnit in Android API 21 seems to be JUnit3

Enable JUnit4 #23