BF: ensure ordering of OrderedDict keys

Test was failing because of unexpected key ordering - closes gh-2503.