Tests for map option
Merge pull request #14 from tschaub/map-tests

Add tests for map option.