Merge pull request #182 from kevinloh/master

Added Test Labels for QuestionServiceMockTest
Removed TODOs in MainActivityTest.