Fixed test.  broke out the pieces of the order that will actually be invarient.