Bug fixes in Android, and changed start functions in test_client