Fix tests.  Simplify map.