Followup r105809; Split up the tests with a dataProvider and add a round trip test.