Add more tests for map output to bring test coverage up to 100%