Fixed broken tests, and refactored GetCurrentOrders to use the GetCurrentOrder method.