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

Update testing sample data.