More changes to data source round trip test suite