added support for map<int,int> and tests