Unnecessary use statement
Fix calls to static::map
Implement tests for Map and Iterable