Solve variable ordering problem

Previously, the Groovy tests relied on an enumeration that resulted in
a predictable order.  This order was not actually predictable.  This
change removes that dependency.

[#51899913]
Merge 51899913-test-failures to master

[Completes #51899913]