New branch for issue #489 ; regenerate the data.
Merge pull request #599 from fred-wang/issue489

New branch for issue #489 ; regenerate the data.

There are still some issues to be resolved, but this will let the testing proceed as we work on some of the details.