renamed MapDataHelper and test classes