Renamed orders.order_type to order_type_id in the hbm and test data files