Refactored few methods and adjusted unit tests
Merge remote-tracking branch 'origin/MOB-2376' into MOB-2376

Conflicts:
	extensions/wikia/WikiaInteractiveMaps/controllers/WikiaInteractiveMapsPoiCategoryController.class.php