Attempt to fix 5.8 & 5.10 utf8 test failures