Fix compilation failure with map<int,int>
Add basic map tests