Add map; Remove unused headers; Tests for map