Better fix for unit tests. Rely on the string key, not the string.