Back to android-test for the time being