Fixed #1 replace characters w/ surrogate pair to unicode code point w/o surrogate pair
Fixed #1 test code