added test case for orderlist class
merged conflicts