test map improvement