Add testing for Map