Modify new CID tests to use native string keys.