More unicode fixes in the test suite