Fixed renaming of date field and added table field checks
Updated unit tests to check for new order fields
Merged surcharges and order data into one XML file
Added unit tests for product collection items