Minor optimizations && First draft of IntIntMapTest

Seem the code is not aligned correctly.