Added mapping data to field values, fixed broken tests.