map+set: changed internal key name and added test