Fix bug in expanding from indexed to array Map node. Add more complete Map test coverage. #81