Forgot to refactor the roundtrip tests

I removed some columns to try and minimize the amount of test data I'm
requiring and forgot to update the test code.