Refactoring for Testability

Apply dependency injection and decoupling patterns to make complex mobile components easier to test.