Switching a number of tests to support new orders

Change-Id: I3a790ff3f67a58b8d026b4c9af2e8b6097430218