fixes for launching test suite on android