Is poor architecture in your Android app creating cluttered activities and untestable code? This talk will be about the benefits of converting to a Model-View-Presenter design to tidy up your app and conform with the principle of Separation of Concern. In addition, we will discuss the existing challenges of unit testing within the Android lifecycle and how MVP allows for increased testability. Finally, there will be a hands-on workshop of converting an example Android app to MVP architecture. By following a few rules such as injecting dependencies through a factory constructor and mocking dependencies in unit tests, we can turn an untestable activity into one with complete code coverage. This talk will assume a basic knowledge of writing JUnit tests and mocking objects.