2.8 test-suite fixes

So the code changed here (2.8 does 10058) - if this is a code that *we* picked as a conversion (to 100), then we need to make sure that 10058 from 2.8 is also translated to 100.