Get rid of the map in the tests