fix up for junit3 conversion
more tests in android environment