Modified MainActivity to allow for testing of some components, added
tests in MainActivityTest