Android Tests: Code clean up
Android Tests: Formatting
Issue #134: Clean up imports
Issue #134: Deprecation warnings
Issue #134: Serializable warnings
Issue #134: Unchecked casts warnings
Issue #134: Unused field warnings
Merge pull request #181 from codeguru42/issue134-lint

Issue #134
Merge pull request #180 from codeguru42/edit-test

Android Tests