Android Tests

Clean up Android tests: formatting and consistent coding style.