Updated Order/OrderTest Tests