Some more cleanup and additions
Android is seriously not test-friendly