Improve test speed by making the map builtin