Update brochure sample data.
Update testing sample data.
Update testing sample data.
Some more cleanup of ids
Update field list
Merge pull request #2383 from elinw/updatetestingdata

Update testing sample data.
Merge pull request #2366 from elinw/brochure

Update brochure sample data.