added order making in testOrderHistory
(cherry picked from commit da4ebab)
(cherry picked from commit ed71e83)