support for Map<String,...>

Added support for Map<String,...>
Removed unused test