Use sorted-map in tests to deal with ordering issues
Convert remaining maps into sorted-maps
Merge pull request #117 from bagl/issue-116

Use sorted-map in tests to deal with ordering issues