Moved activity class into activity package and refactored unit test of main activity class