Removed obsolete tests from MainListViewActivityTests
Merge branch 'Costa'
Merge branch 'master' into steven