Minor optimizations && First draft of IntIntMapTest