Improve data for integration tests
This PR changes some of the data used in integration tests to be more valid. "More valid", you ask? Well, it's probably not completely valid still, but these changes are the start of a fully passing test.
Please review: @ahoffmann @weizhong-wang @lloyd-carter @KJOYNER