Fixed mapping test - added fields missing from map