use ordereddict when marshalling in tests