|#979|Fixing field names in Order Mapper. Adding test dependency on shipment for web.