Fix a couple sets of tests in modeling. This has two problems: One was the use of parameters.values() in a context where the order of the parameter values *does* matter. The fact that it was working before was only by luck.  The other problem was that it modified global state, causing subsequent test executions to break.
Reset the master_transform_graph after this test; included note that this should be redone in the context of #2347
Merge pull request #1822 from embray/test-isolation

Fix tests that violate isolation