Merge changes I3c1f5ac1,I269c9aa8

* changes:
  Switch code point table
  Test for code point table (dicttool test)