Android only support JUnit3.  Reformatted tests to run in JUni3