Extract map names
Extend test data
Add Name
Extend tests