Organize imports in tests
Remove trailing whitespace in test/AndroidManifest.xml