We were depending on a side effect of the string conversion
These names don't make sense now that we run both suites the same way.