Add unit tests for Map