use - in key json response key names and refashion some of the tests

S-47060