Add test coverage for map