Add Order Confirmation. Fixed test bugs