Android Tests: Code clean up
Android Tests: Formatting
Merge pull request #180 from codeguru42/edit-test

Android Tests