small cleanups to Mapping tests work for keys with no operator</triats stuff