map + map.tests + README + Some changes