Fix some minor android stuff and commented out some tests