[KW,MS]{test after code} - Added tests for ImageViewActivity
[MM,PS,MS] - Fixed map, added map feautures, fixed test cases