Unicode fixes so that tests pass