Refactored mobile app code to resolve FindBugs bugs.
Fixed mobile tests.