added test for ordered keys
using OrderedDict to preserve key order
Merge commit '2566581442eff9b17ee439296e7c4e9c232cee26'