improved unit tests for Map